Re: merging into locally added files
From: Paul Burba <ptburba_at_gmail.com>
Date: Wed, 4 Aug 2010 11:23:00 -0400
On Wed, Aug 4, 2010 at 10:52 AM, Julian Foad <julian.foad_at_wandisco.com> wrote:
This change in behavior seems sound to me and I don't see it causing
> if the tree conflict detection policy is "relaxed", and should be a
I don't follow you there, how would a merge to a file ever be a tree
> Please do split up the patch!
> - Julian
This is an archived mail posted to the Subversion Dev mailing list.