Merge a branch into the trunk using Tortoise SVN

We'll assume you have done some changes in the branch that you are working on and you want to merge those changes into the trunk. Here I will outline some steps using the svn command line tool and the TortoiseSVN tool using Windows 7.

1) Checkout the branches and trunk from SVN (if you do not have a local copy) using command line for example:

    svn checkout link_to_svn_repository WRK --username your_username

2) Browse to the folder where your working copy is located (e.g, where you previously checked out) and using TortoiseSVN tool, right click on trunk and choose Merge...

After choosing Merge, next choose reintegrate a branch:

click Next and choose which one of the existing branches to reintegrate:

4) Click Next -> Merge and wait for completion

5) The trunk has now new changes, so commit the changes back into the SVN:

    svn commit -m "Reintegrate branch 1.2"