Re: "svn diff" and "svn merge" sittin' in a tree

Philip Martin <philip@codematters.co.uk> writes:
> One related point: thus far, I have been assuming the merge gets
> written into a working copy. I suppose the merge could get committed
> straight into the repository if there are no merge conflicts. I can't
> imagine ever wanting to do this with code I was developing, but I can
> see that it would be possible for Subversion to do it.

Confirmed -- although it's possible for Subversion (or any system) to
do automated merging, especially if no conflicts, we don't do so.
Same reason as CVS: prefer to have a human vet the merged result.

-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:06 2006