-
Notifications
You must be signed in to change notification settings - Fork 29
Team changes #41
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Team changes #41
Conversation
2) refactored IChangesetProvider : the username is only needed for MyChangesetProvider --> username is passed via constructor
… into TeamChanges
… into TeamChanges
… into TeamChanges
|
Hi. Build failed. I can't merge pull request |
|
I'll have a look in fixing this, ... |
|
I've been looking into it for some time, but am not able to fix it. It works and compiles perfectly in VS2017. |
|
YES, build is ok |
A new section (view) has been foreseen : TeamChanges
Purpose : merge all not yet merged changesets from one branch to it's parent or child branches (GetMergeCandidates)
like the original merge in TFS itself, but with the bonus of linking all workitems.
First you choose the TFS project
Next your source branch, and the target branch.
Next fetch the changesets
Choose which to merge
Press the merge button
The original RecentChangeset functionality is still there,
so one can choose which option to use for merging.
Big overview of the changes :
Renamed folder RecentChangesets to Changesets
Added folder 'Changesets\Providers' and moved all the providers in it
Added folder 'Changesets\Solo' and moved the existing RecentChangesets view in it
Added folder 'Changesets\Team' and added the team view in it
Renamed a few classes from RecentX to X, because they are used in both views and do not have any
functionality related to the 'recentChangeset' itself
IChangesetProvider : Task<List> GetChangesets(string userLogin);
changed to Task<List> GetChangesets();
you can also get the code with all the changes here :
https://github.com/RubenWillems/AutoMerge/tree/TeamChanges
if you want to try it out before merging