Merge two branches two a third branch?

ronnyek · Post by **ronnyek** » Mon Sep 18, 2006 4:36 pm

Ok,

First of all, I'm working with Vault 3.1.6.3658.

In about a week or so, we're going to begin the process of merging two branches... and was curious if there was a way I could attempt this with some sort of merge these two branches to a third branch or any sort of thing along those lines? Perhaps copy this branch, and merge with other?

I'd like to get any sort of idea of how well vaults goign to be able to handle this ahead of time... so I can get an accurate idea of how much time will be required etc.

Thanks in advance.

Beth · Post by **Beth** » Tue Sep 19, 2006 7:57 am

You would have to make a copy of the whichever folder you want as the target and then merge the second folder into that target.

You didn't ask about the following, but I'm going to mention it anyway...
If you are using Vault with some other IDE though, you might not have the bindings to the folder you copied, and your solution file will not have the new merged files in them by going about it that way. Basically, Vault will be fine with this, but your code might not be, so be prepared and think ahead.

ronnyek · Post by **ronnyek** » Tue Sep 19, 2006 8:09 am

Oh good call... well I use vs.net 2003... and when I branched switching branches is quite a pain in the rear end, but it was doable.

So you are saying there may or may not be files that are "include in project" that wont be merged properly? Or something different all together?

Beth · Post by **Beth** » Tue Sep 19, 2006 8:23 am

What I'm thinking is that the merge will go fine. Vault should be fine with it.

Once VS is involved, it becomes a different story. Ok, rereading your post, you mention you've switched around what branch to use, and that's more of what I was getting at. As long as you know in VS you have to do a little hoop jumping to get to your new code you'll be fine. I'm not sure if it will be more difficult or not with a copied folder.