Re: How to disable automatic merging...

On Mon, 10 Dec 2007 14:01:14 -0800, Noah Spurrier wrote:

> That makes the problem even more painful! It requires prior coordination
> for every little edit. It completely kills the fun of source control
> (svn branch merging is less than fun).
>
> Besides, if engineer A branches; edits; merges; then commits the merge
> and engineer B does the same then I believe that SVN could still
> automatically merge the file which would then make it back to the trunk
> if someone misses a G fly by. Am I wrong?

Yes, I believe this is true when your source code is hopelessly
unfactored and people have to work on the same files when fixing totally
separate things, a problem I've fortunately avoided in the past!

-- 
Sohail Somani
http://uint32t.blogspot.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org