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.
Workspace selection: Possibility to quickly switch between workspace when merging branches
Project name from Visual Studio Team Service
Source branch
Target branch
Possible changesets between source branch and target branch (Changeset id, Check-in date, User, Comment)
Command for fetching the changesets merge candidates between the two branches
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.
Settings screen for modifying certain behavior (see below for more details about the settings screen)
Pending changes after clicking button merge:
Settings screen:
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)
Does not add work items in Pending Changes
When enabled a new button while appear that makes it easier to switch between source and target branch (Thanks Bobinho for this implementation https://github.com/Bobinho)
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)
Merge direction and work items (Shows all the branches and work item ids that are in the merge)
Fixed (Shows fixed comment that you wrote in the textbox below)
Changeset ids (Shows the changeset ids that are in the merge)
Merge direction and changset ids (Shows all the branches and changeset ids that are in the merge)
Changesets details (All the details of the changesets can be added to the comment)
Merge direction and changesets details (Shows all the branches and details of the changesets)
Show latest version in comments when merging all possible changesets
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)
