Merge branch with trunk

Question

Using TortoiseSVN, I need to take changes I\'ve done in a branch and then merge them with trunk.

I am the only developer on this project, so I know trunk hasn\'t chang

Answer 1

I think in TortoiseSVN 1.8.5, Merge | Merge two different trees should work. When you merge a branch/tag back to trunk, the trick is that the From URL is the trunk and the To is the tag/branch. Weird but true.

Source: Merging

For directories that not in your working copy but are in the tag/branch you may get conflict errors. Just accept the conflict and redo the merge.