Re: How to disable automatic merging...

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.*"
>
> This way you can control how often people can drive you insane.

Or, you can prevent them from helping you which is more often the case
when you all commit/update frequently and diff against previous version
to keep track of the changes.

-- 
   Les Mikesell
    lesmikesell@gmail.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org