Performing a Team Foundation Server Merge Operation

If you have ever want to learn how to perform a TFS Merge Operation using Visual Studio (and not the command line), this is how you do it:

Once you are completed with the Merge operation, you will have to resolve any Conflicts which arise due to the Merge operation and you have the following options to choose from:

• Merge Changes in Merge Tool
• Keep Target Branch Version
• Take Source Branch Version

If you intend on merging changes in a Merge Tool, I highly recommend a 3rd party merging tool such as Beyond Compare (http://scootersoftware.com/) to help you perform the merge operations!  

That is all there is to it!