Also: Visual Studio 2017 version This merge tool will let you merge multiple changesets to another branch with ease. It is based on 'Find changeset by comment', which lacked the Merge functionality so I made this plugin. This is how it works: Go to 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.
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 1.0.0.7: Fixed situation where many changesets with moved files and folders could cause unintended file changes to be merged as well Version 1.0.0.5: Fixed bug where indicator of a changeset-inbetween would not display on first search. You can now also choose to include all relevant files associated to the changeset-inbetween automatically by checking 'Include relevant changesets'. Version 1.0.0.4: When adding multiple changesets, an changeset-inbetween could be present which does not match the search criteria. There is now an indicator in the file list if this is the case. Note that this changeset-inbetween will be included when merging: if you don't want these changes, you'll have to manually remove the lines of code from pending merged files after merging. Version 1.0.0.3: Double click on a found file gives you the file history Version 1.0.0.2: fixed bug where window would open and close immediately Version 1.0.0.1: inital version |
