Tree conflict problem when merging two branches

Hi all, First time posting. -Create a repository (trunk/tags/branches), -Checkout /trunk, -Create branch1 in /branches/branch1, and checkout. -Create and checkout branch2. -Create file.txt in Trunk + add + commit. -Merge trunk changes into branch1 and commit. -Merge trunk changes into branch2 and

Re: Tree conflict problem when merging two branches

> On Aug 12, 2016, at 3:00 PM, André Roy wrote: > > Hi all, > > First time posting. > > -Create a repository (trunk/tags/branches), > -Checkout /trunk, > -Create branch1 in /branches/branch1, and checkout. > -Create and checkout branch2. > -Create file.txt in Trunk + add + commit. > -Me

Re: Tree conflict problem when merging two branches

Hi Ryan, I'm interfacing using TortoiseSVN, so I cannot really provide a transcript. Those are however the exact sequence of events that will reproduce the conflicts. André On Fri, Aug 12, 2016 at 3:20 PM, Ryan Schmidt < subversion-2...@ryandesign.com> wrote: > > > On Aug 12, 2016, at 3:00 PM

Re: Tree conflict problem when merging two branches

On 13.08.2016 00:20, Ryan Schmidt wrote: >> On Aug 12, 2016, at 3:00 PM, André Roy wrote: >> >> Hi all, >> >> First time posting. >> >> -Create a repository (trunk/tags/branches), >> -Checkout /trunk, >> -Create branch1 in /branches/branch1, and checkout. >> -Create and checkout branch2. >> -

Re: Tree conflict problem when merging two branches

Thanks Brane, Has a bug report been filed or should I try to file one? André On Sat, Aug 13, 2016 at 5:07 AM, Branko Čibej wrote: > On 13.08.2016 00:20, Ryan Schmidt wrote: > >> On Aug 12, 2016, at 3:00 PM, André Roy wrote: > >> > >> Hi all, > >> > >> First time posting. > >> > >> -Create a