SVN: Merging a Branch into Trunk

Merge a Branch into Trunk

1. Check out a copy of trunk:
   svn co svn+ssh://server/path/to/trunk
2. Check out a copy of the branch you are going to merge:
   svn co svn+ssh://server/path/to/branch/myBranch
3. Change your current working directory to "myBranch"
4. Find the revision "myBranch" began at:
   svn log --stop-on-copy
   This should display back to you the changes that have been made back to the point the branch was cut. Remember that number (should be rXXXX, where XXXX is the revision number).
5. Change your current working directory to trunk
6. Perform an SVN update:
   svn up
   This will update your copy of trunk to the most recent version, and tell you the revision you are at. Make note of that number as well (should say "At revision YYYY" where YYYY is the second number you need to remember).
7. Now we can perform an SVN merge:
   svn merge -rXXXX:YYYY svn+ssh://server/path/to/branch/myBranch
   This will put all updates into your current working directory for trunk.
8. Resolve any conflicts that arose during the merge
9. Check in the results:
   svn ci -m "MERGE myProject myBranch [XXXX]:[YYYY] into trunk"

That is it. You have now merged "myBranch" with trunk.