Visual studio 2010 TFS Perform baseless merge
This How To article walks you through the process of merging files from two branches that are not related to one another. The process of merging items that are not directly branched from each other is called a baseless merge. To perform a baseless merge, you must use the Tf merge command. You cannot perform a baseless merge operation from Visual Studio. Contents Objectives Overview Summary of Steps Step 1 – Evaluate Whether a Baseless Merge Is Needed Step 2 – Perform a Baseless Merge Using Tf.exe Step 3 – Resolve Merge Conflicts Step 4 – Check-In the Merged Changes Additional Resources Objectives Learn how to decide if a baseless merge is necessary Perform a baseless merge and resolve merge conflicts Overview The process of merging items that are not directly branched from each other is called a baseless merge. For example, you might want to merge a change between two release branches, which are siblings of each other, without merging up to the parent branch. You can ...