Changed workflow for merges with conflicts to allow resolution and continue with checkin
Added comment prefix 'Merge {source changeset}: ' to checkin comment for target
Added link to changeset details in notification on successful checkin
Bug fixed: Crash on unset workspace
V.1.1.2 Update:
Added cancel button for long running queries
Added sort option for merge list
Maintain existing list on team explorer navigation
Cross out just merged changeset on clicking back button from details page
V.1.1.1 Update:
Added ability to save default source and target branch
Fixed layout issues
Fixed performance bug where it was retrieving the list multiple times on startup
Added explicit button to retrieve list
V.1.1 Update:
Fixed bug for dll loading
Fixed to filter to only own merge changesets
Description
This extension allows you to merge changesets between a source and target branch. It integrates into the Team Explorer, eliminating the need to go to the Merge default screen.
Benefits:
Allows you to continue to work without opening the default modal dialog for merging
Automatically associates the source changeset's work items and comment. This saves time having to fill in the information when checking in from Pending Changes after a merge is executed.
Features:
Uses the workspace chosen in Pending Changes
Conforms to Visual Studio UX guidelines for Team Explorer extensions
Does not show deleted branches
Current limitations:
No baseless merges
Goes from root of branch - no drilldown to specific workspace folders
If you would like to help contribute, check out the CodePlex project:
