Pin Point Merges

Branches are typically created so that each branch can evolve independently for a period of time. Sometimes, the changes that differentiate two branches are too numerous or intertwined to allow the branches to be merged back together completely. Team Foundation Server addresses this scenario by allowing you to merge specific change sets between branches.

Figure 1 shows the Source Control Merge Wizard. This wizard allows you to determine how the branches will be merged together. The option highlighted in Figure 1 is the option to merge only selected change sets.

Figure 2 shows the next page in the Source Control Merge Wizard, shown after this option is selected. This page lists the specific change sets, which represent the differences between the two branches being merged. You can choose specific change sets from this list, and Team Foundation Server will merge these between the branches.


Figure 1 - Merging selected change sets

Figure 2 - Select individual change sets to merge