This tool is improving the merge functionality that Visual Studio has for TFS. It supports baseless merging, as well as easy merging of non-consecutive changesets. It also auto-associates the TFS items linked to the original changesets. The VS2019 version will be kept in sync with the VS2017. Shortlist of updates: v1.1.12: alphabetically order available branches. v1.1.10: Option to include intersecting files & fix incorrect detection of source branch when unshelving v1.1.9: granular control over which files are included in the merge. v1.1.8: unshelve to specific branch. Please see the 2017 version for more details, found here |