I’m really new to SVN and seem to be missing something here…
I have a SVN checkout of my trunk which is a running website. I created a branch to which I made numerous changes. I would now like to merge those changes into the trunk.
So I:
- Right click the trunk checkout folder
- Select “Merge…”, then “Reintegrate a branch…”
- The “From url” shows the location of the branch while “Working copy” shows the path of my trunk checkout
- When I click “Next” and then “Test merge” it shows lots of tree conflicts (all of which are files/changes I made in the branch)
What am I doing wrong here?
You done nothing wrong (almost nothing), except exploring SVN-merge limitation before refactoring of code. “Tree conflict” appear on merge if same file (for both sides) was renamed (moved) on one side and edited on another. Is it your case? See my trunk and branch, it’s my example of tree confict in action.
In order to get merge done, you can merge files before merge pathes, by hand – i.e merge all sources of tree-conflicts (trunk-file && branch-file)