How to merge a branch back into trunk using SVN
To merge a branch back into the trunk using SVN: (Assume your local corresponding folders are branch and trunk)
1. Get the revision number at which the branch was created
# cd branch # svn log --stop-on-copy
2. Get the head revision number of your trunk
# cd trunk # svn update
3. Merge in action
# cd trunk # svn merge -r <BRANCH_CREATION_REVISION_NUMBER>:<HEAD_REVISION_NUMBER> http://example.com/svn/repos/demo/branches/<MY_BRANCH> .