> On Aug 12, 2016, at 3:00 PM, André Roy <an...@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 file.txt. > > 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? http://svnbook.red-bean.com/en/1.7/svn.branchmerge.html
