Stefan Sperling wrote:
On Sun, Dec 20, 2009 at 06:02:22PM +, William S Fulton wrote:
Hi,
We have been doing regular two way merges from trunk to branch and
vice-versa using svn 1.5. In 1.6 this results in tree conflicts. Is
there any guidance on how to deal with this scenario?
I think you
On Sun, Dec 20, 2009 at 06:02:22PM +, William S Fulton wrote:
> Hi,
>
> We have been doing regular two way merges from trunk to branch and
> vice-versa using svn 1.5. In 1.6 this results in tree conflicts. Is
> there any guidance on how to deal with this scenario?
I think you should try to av
