Re: How to disable automatic merging...

Sohail Somani wrote:
> On Mon, 10 Dec 2007 15:44:01 -0600, Les Mikesell wrote:
>
>>> 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.
>
> I'm not sure if this was meant sarcastically or not. Branching is a
> fundamental mode of development that allows you to isolate all *your*
> changes and all *their* changes. It really is quite beautiful when used
> right.

Yes, if you want to end up with two different versions it is great, or
if you just want to defer the conflicting merge issue until you have
time to determine which version is better. But, if you let the
conflicts accumulate somebody is probably wasting their time with
changes that will end up being discarded.

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