Re: How to disable automatic merging...

On 2007-12-10 20:53+0000, Sohail Somani wrote:
>On Mon, 10 Dec 2007 13:33:53 -0700, Gus Hart wrote:
>
>> Here's an example why I might not want auto-merging (BTW, no one
>> answered my question, only questioned my premise...).
>
>I did answer:
>
>"Are you sure you really don't want SVN to merge when you svn up a file
>you have changed? I'm not sure I understand why. *If you don't want
>another developer's changes to mess up your work, use branches.*"

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?

-- 
  Noah Spurrier | email: noah_at_noah.org | http://www.noah.org/wiki/engineering 
-------------------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org