Just wanted to dump a quick how-to on doing branch to trunk merges in VS Team. It is pretty simple really, only a few steps.
- Pull the latest of the branch to your local disk
- Pull the latest of the trunk to your local disk
- Merge and Pray (more on this at a later date)
Yea sounds pretty easy right.... WRONG. Tonight we spent 5 hours doing a very long, very painful, very tiring merge. Only to finally realize that the person doing the merge (we were doing a group merge via desktop sharing because of what had changed) had not gotten latest of the trunk.
We all just assumed that it would merge with the latest in the trunk and not look at your local disk. Boy were we wrong.
The entire time we were doing the merge, something did not feel right. Well, that damn gut feeling was right again. Oh well, we will try it again, this time with the LATEST.
So, just remember, GET LATEST FIRST.
Till next time,
Derik the merge exhausted (sorry Kyle, had still your signoff this time) :)
02-14-2008 9:43 PM