Re: Tree conflict problem when merging two branches

2016-08-15 Thread André Roy
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, > >> >

Re: Tree conflict problem when merging two branches

2016-08-12 Thread André Roy
ug 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 branc

Tree conflict problem when merging two branches

2016-08-12 Thread André Roy
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