SVN: Merging a Branch into Trunk

1/ Find the revision your branch began at: svn log --verbose --stop-on-copy svn+ssh://server/path/to/branch. The final revision printed by this command is the revision in which branch was created by copying.
2/ Change your current working directory to trunk
3/ Perform an SVN update: svn up
4/ This will update your copy of trunk to the most recent version, and tell you the revision you are at: rYYYY
5/ Now we can perform an SVN merge: svn merge -rXXXX:YYYY svn+ssh://server/path/to/branch
6/ Resolve any conflicts that arose during the merge
7/ Commit: svn ci -m "MERGE myProject myBranch [XXXX]:[YYYY] into trunk"

You may also like