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.
On Fri, Aug 12, 2016 at 3:20 PM, Ryan Schmidt <
> > On Aug 12, 2016, at 3:00 PM, André Roy <andre_at_dsa-ltd.ca> 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.
> > -Merge trunk changes into branch1 and commit.
> > -Merge trunk changes into branch2 and commit.
> > The problem:
> > -Merge branch1 changes into branch2, gives me a Tree conflict with
> > Am I doing something wrong?
> Probably :)
> Show us the exact transcript of commands you used for the above?
> Review the merging chapter in the book?
André Roy, P.Eng.
Dynamic Systems Analysis Ltd.
101-19 Dallas Road
Victoria, BC, Canada; V8V 5A6
p: +1.250.483.7207 ext. 106
Received on 2016-08-13 00:54:40 CEST