Merging branch code with trunk in Tortoise SVN

In normal development environment we do development on trunk. But after the first product release, we create an branch out of trunk so that the new release can be worked on trunk and any maintenance issues coming on production release can be worked in branch. In case we have made some urgent fix from branch code, we have to merge those changes in trunk as well so that code across branch and trunk are in sync. In this article we would learn how we can merge the branch code with trunk using Tortoise SVN.

Step 1 : Go inside the folder were trunk code resides.

Step 2 : Right click and go to TortoiseSVN sub-menu.

SVN Merge

Step 3 : Select the first option i.e. Merge a range of revisions and click on Next

Step 4 : Select the branch url from which you want to merge the code to trunk and click on Next

Step 5 : Finally we perform test merge or directly merge the code

Tagged . Bookmark the permalink.

Leave a Reply