TFS merge change set to main branch
21,608
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.
Author by
Shiraz Bhaiji
Architect / dev lead / .net programmer Manager at Evry http://www.evry.no/ Board Member Oslo Software Architecture http://www.meetup.com/Oslo-Software-Architecture/
Updated on July 23, 2022Comments
-
Shiraz Bhaiji almost 2 years
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?