Merge your branches with all associated work items of the changesets.
About the extension
A new button will appear in your Team Explorer. Here you can easily merge branches with each other. When merging changesets between branches the associated work items of the changesets will also be added in the pending changes.
A quick overview of the extension:
1. Workspace selection: Possibility to quickly switch between workspace when merging branches
2. Project name from Visual Studio Team Service
3. Source branch
4. Target branch
5. Possible changesets between source branch and target branch (Changeset id, Check-in date, User, Comment)
6. Command for fetching the changesets merge candidates between the two branches
7. Command for merging the selected changesets between the two branches. Puts the merging changesets and all the associated work items of the changesets in Pending Changes.
8. Settings screen for modifying certain behavior (see below for more details about the settings screen)
Pending changes after clicking button merge:
Checks before merging that your workspace does not contain any more included changes. If it does it will stop the merge and show a warning.
Auto select all changesets after you fetched all your changesets.
When checked, remembers the last selected branches for current open solution (thanks Maikel Tielens for this implementation https://github.com/maikelt)
The latest version of the selected branch(es) will be fetched before the actual merge happens
If this checkbox is checked then the resolve window will pop up otherwise a warning will show
Select the comment option:
None (no comment)
Merge direction (Shows the branches that are merging)
Work item ids: (Shows all the work item ids that are in the merge)
Fixed (Shows fixed comment that you wrote in the textbox below)
A textbox were you can adjust your comment text or write your fixed comment
The final output of your comment
Possibility to exclude work item types for merging. (If you would merge a Code Review Request work item, it would also automatically close)