In subversion I made a branch now I want to merge it back into trunk. Which option should I use?
Reintegrate a branch
or
merge a range of revision
I was using Merge a range of revisions, but I was getting all sorts of tree conflict errors. Any idea what the difference is between these two?