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.
There are two ways to initiate a merge using this plugin:
1. Cherry pick changesets from History
Using Source Control Explorer in Visual Studio, get the history for any folder or file. Select one or more changesets in the list and right-click your selection. The context menu will now have a 'Merge...' option. Clicking this will give an overview of the selected changesets and files associated with those changesets.
2. Extensive search for changesets
In Source Control Explorer in Visual Studio, right-click your branch, and choose the new menu-option ‘Merge Changeset By Comment’.
After that, enter the TFS item under phrase. This will only search comment-texts, so be sure to add the TFS item number as part of your comment with your checkins.
It will show you all Changesets, and Files associated with the TFS Item:
If searching for a comment with an identifier, and one found file has 3 changesets, of which the 1st and the 3rd have the identifier in the comment text, the second changeset ('changeset-inbetween') will be included when merging, to ease the merging process. The files which have a changeset-inbetween are indicated with a notification-icon. Double-clicking that file will show the file history to help you find out which lines of code you may want to prevent from being merged, when reviewing your pending changes.
Next step is clicking the 'Merge' button, after which you can choose from an eligible merge destination. You can type in a custom path, which will trigger a baseless merge.
Then check your pending changes and resolve conflicts as you normally would.
Tip 1. You can search for multiple TFS Items, and merge then in one go by checking 'Keep previous found changesets' , filling in a next tfs item and hit search again. Useful when merging all changes for a large user story, and checking them in under a single TFS item.
Tip 2. You can merge all changes for each file by checking 'Merge all changes to files' , regardless if the changes have been made by your particular tfs checkin. So it’s basicly merging the latest status of a file to the next branch. Be sure to check your pending changes with this one.
Version History Version 188.8.131.52: removed Visual Studio 2019 support from plugin, as it used incompatible visual studio dll's. Created a seperate versioned plugin instead, found here
Loading More data ...