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. v1.1.18: improved TFVC workspace resolution and DTE integration. Credits: Yonathan-F v1.1.17 Fixed bug when using workspacenames under 15 chars v1.1.16 Added the ability to choose a workspace if none can be determined automatically (tested & implemented by https://github.com/shuelsmeier) v1.1.15 Added support to search for Work Item (tested & implemented by https://github.com/vihtap) v1.1.14: Fix an issue where unshelving did not properly identify branches with the same name-endings v1.1.13: moved source code to GitHub 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. |