Re: How to disable automatic merging...

Sohail Somani wrote:
> On Mon, 10 Dec 2007 16:22:27 -0600, Les Mikesell wrote:
>
>> 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.
>
> Deferring conflicts to when you are ready to handle them is useful. I'm
> surprised I'm alone on this. Well, I haven't actually read most of the
> other posts...
>

You are not alone. It's a matter of policy and what makes sense in your
environment.

See:

http://www.cmcrossroads.com/bradapp/acme/branching/branch-creation.html

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Dec 11 00:58:48 2007