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.......