Re: Why is --reintegrate neccessary?

On 9/23/2010 3:27 PM, Piers Haken wrote:
>> I'm hoping that 1.7 will address much of this...
>
> Hmmm, just to manage some expectations: I wouldn't expect too much tree-conflict or merge improvements in 1.7. There might be some small improvements here and there, but the big ones will not be in 1.7.
>
> That's very sad. I love SVN, but I'm not sure my patience will last for another year... :(

Maybe it is just the nature of the feature-branch model. Do you really
have that much trouble with people doing concurrent work in the trunk
and fixing their conflicts as they happen?

-- 
   Les Mikesell
    lesmikesell_at_gmail.com