technical-recipes.blogspot.com

To merge changes made in your branched project back into the trunk (re-integrate). For branching in TortoiseSVN see this previous post . So you've now made some changes to your branched project that have been debugged, tested, reviewed etc and checked in. Given that you and your team are happy with the branched changes, you now wish to re-integrate them back into your trunk.

Repository Conventions When using Subversion / TortoiseSVN I tend to use the 'conventional' repository layout by adding branches/tags/trunk directories to the root: (Please click on any images shown here to enlarge.)

These instructions pertain to the use of Visual Studio 2010, but barring one or two differences should be reasonably applicable to other versions of Visual Studio as well. Much of the following instructions can also be found over at the functionx site , but more screenshots are included here to give a clearer understanding.