Question about merging branches

ROTRTechTeam · Post by **ROTRTechTeam** » Mon Apr 04, 2005 11:30 am

I have two branches of my code. One is the copy I compile builds from and the other one is for some contractors to work in. First, I know that when the contractors finish their project for me, I merge their branch and my branch together. However, if I make changes to my branch and want to send JUST THOSE CHANGES to the contractors' branch, can I do that (ie. one way merge)? If yes, how? If no, what should I do to handle this?

Mike

ericsink · Post by **ericsink** » Mon Apr 04, 2005 11:49 am

Actually, the behavior you want is the default behavior.

Actually, it's the only behavior.

Despite the connotations of the word "merge", Merge Branches is a one-way feature. It helps you take a collection of changes which have been made in one folder (branch) and apply those changes to somewhere else. When you use the feature, you have to specify an "origin" and a "target". The origin will be unmodified.

ROTRTechTeam · Post by **ROTRTechTeam** » Mon Apr 04, 2005 12:04 pm

Great! That's what I wanted to hear. Thanks for your help!

Mike