I’ve been working on a feature in an SVN branch for a while. Periodically, I merged changes from trunk into my private branch so I could get everyone else’s changes using the procedure described here. That seemed to work fine.
Now I’m ready to merge my changes into trunk. I’m trying to do this by merging the range of revisions starting from the point I branched and ending with HEAD of the branch. But when I try to do this, SVN reports numerous tree conflicts. It looks like every file that was added in trunk (and merged into my branch) is in conflict.
I was hoping that by merging periodically from trunk into my branch, the merge going in the opposite direction would be trivial. Apparently not. What am I doing wrong?
You need to re-integrate the branch.
Also, when you merge the trunk back into your branch, you should have merged with ancestory otherwise SVN doesn’t know what revisions have been merged.