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. Please see the 2017 version for more details, found here |