TFS merge change set to main branch

Question

If a file has been changed by 10 different changesets, with different users for various changesets.

Then the user that checked in changeset 5, decides to merge his changes.

What will then happen to the changes in changeset 1 to 4? Will they automatically be merged?

Answer 1

Yes, TFS will merge all changes UP TO and INCLUDING changeset 5 automatically.

When you merge a particular changeset back to Main, you are effectively asking TFS to integrate all changes beginning from the previous baseline up to the changeset that you specify.

Answer 2

TFS has two ways of merging (you can select either one in the TFS Merge dialog):

• All changes up to a specific version
• Selected change sets

In the second case, you can cherry-pick any change you want, without necessarily merging all other change sets.