Add accept all incoming or current changes in popup-menu. Fixes: #53133 #53649
Merged
chrmarti merged 1 commit intomicrosoft:masterfrom Oct 1, 2018
Merged
Add accept all incoming or current changes in popup-menu. Fixes: #53133 #53649chrmarti merged 1 commit intomicrosoft:masterfrom
chrmarti merged 1 commit intomicrosoft:masterfrom
Conversation
mnikn
changed the title
chrmarti
reviewed
Jul 9, 2018
| "scm/resourceState/context": [ | ||
| { | ||
| "command": "merge-conflict.accept.all-current", | ||
| "when": "scmProvider == git && scmResourceGroup == merge", |
Collaborator
There was a problem hiding this comment.
This is not specific to git. @joaomoreno Should we do this for any files in 'merge'?
joaomoreno
approved these changes
Jul 9, 2018
| "scm/resourceState/context": [ | ||
| { | ||
| "command": "merge-conflict.accept.all-current", | ||
| "when": "scmProvider == git && scmResourceGroup == merge", |
Member
|
What is the status of this PR? It seems pretty old. This functionality would be convenient to have. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes: #52632