Add abort command for git merge#152526
Closed
pkmnct wants to merge 2 commits into
Closed
Conversation
|
|
|
Would love to see this merged! |
Member
|
@pkmnct, thank you very much for your contribution. |
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.
3 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.
This PR fixes #152525
I find myself often needing to abort a merge. I now know the command by memory,
git merge --abort, but it is one of the few times I actually find myself running a git command in the context of VS Code. GitHub Desktop allows the user to hit a button to abort, so I wanted to see similar functionality in VS Code.This PR introduces the
Git: Abort Mergecommand in the command palette. Users can now simply run this command to abort an in-progress merge.To test: Introduce a merge conflict to a git repository. Rather than completing the merge and solving the conflict, you can now open the command palette and abort the merge:
The command has also been added to the source control menu:
