Reverting a range of commits with conflict
- From
- Sam Lee <skynare@gmail.com>
- Date
- Apr 1, 2019, 17:25 UTC
- Message-ID
- <CACrt3pyZ7XNHLfFM46qymLYft4+jXSU_HBD2Wk+cL6MSzryFhA@mail.gmail.com>
Given:
A-B-C-D-E (HEAD)
I want to create a single commit that reverts A-B-CSo, I execute:
git revert --no-commit A~..C
which causes conflict (while reverting C, it seems).I resolve conflicts and I continue:
git revert --continue --no-commit
And, it complains:
fatal: revert: --no-commit cannot be used with --continueIf I revert --continue without --no-commit:
git revert --continueIt brings up EDITOR twice and I end up with two commits. I can squash them. But, I don't know if this is a desired behavior.
Should I be able to revert --continue with --no-commit? Should revert --continue remember that initial revert invocation was with --no-commit option?
Thanks.