Include revert conflicts in git abort#992
Merged
spacewander merged 2 commits intotj:masterfrom Oct 6, 2022
joshuali925:patch-1
Merged
Include revert conflicts in git abort#992spacewander merged 2 commits intotj:masterfrom joshuali925:patch-1
spacewander merged 2 commits intotj:masterfrom
joshuali925:patch-1
Conversation
spacewander
approved these changes
Sep 29, 2022
spacewander
reviewed
Sep 29, 2022
Collaborator
spacewander
left a comment
spacewander
left a comment
There was a problem hiding this comment.
Let's update the corresponding doc: https://github.com/tj/git-extras/tree/master/man
Contributor
Author
Updated, thanks |
spacewander
approved these changes
Sep 30, 2022
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
If running
git revert <SHA>results in a conflict,git abortwill sayI don't know what to abortbecause it's not checkingREVERT_HEAD