Merging branches

StuartHemming · Post by **StuartHemming** » Thu Jun 05, 2008 7:22 am

I have a setup where the main development is done in the trunk and each new release is branched off so we have a separate copy for patches, etc.

However, I decided, when starting a fairly major project, that it would be a good idea to create a separate branch so that if it all went pear-shaped I could just go back to square one.

However, the Gods have smiled on me and it looks like the whole thing is going to be accepted as 'the way forward'.

The point of this post, I'm embarrassed to admit, is that I have no idea how to go about merging my branch with the main trunk. Is there anyone out there who could give me some clues? My project branch makes changes to existing files, adds new files and has some original files deleted. My branch (and the original trunk) has a number of sub-folders and the new version has both added and deleted sub-folders.

Any help will be appreciated.

Thanks in advance.

Beth · Post by **Beth** » Thu Jun 05, 2008 8:30 am

The function Merge Branches has a wizard to step you through it. Keep track of the changes that you merge over so that the next merge you do, you don't have to merge over those same changes.

With the first merge, if you want to merge everything over, then you will just select all the changes presented. A merge moves things in one direction so if you have things to merge on both sides, then you will be performing 2 merges.

Without seeing your exact repository, it's hard to tell you exactly what to select for changes, which is what ends up being the hardest part for many people. A good way to familiarize yourself would be to connect to our Public Demo Server to try out a few tests with some fake data. What some users do is they might create a dummy test repository on their own server to try tests on, because it's very easy to delete a dummy repository without affecting any other data.

If after trying out a test you are still confused or worried, you can send an email to support at sourcegear.com for more assistance.

StuartHemming · Post by **StuartHemming** » Thu Jun 05, 2008 8:37 am

Beth,

Thanks for the speedy reply.

In honesty I have to admit to never having noticed the "Merge Branches" menu option! I feel doubly foolish!

I take you point both about the public demo server and the local test repository.

Thanks again.

Beth · Post by **Beth** » Thu Jun 05, 2008 10:05 am

Feel free to ask if you have any more questions.