Reverting a range of commits with conflict
- Date: Mon, 1 Apr 2019 13:25:54 -0400
- From: Sam Lee <skynare@xxxxxxxxx>
- Subject: Reverting a range of commits with conflict
I want to create a single commit that reverts A-B-C
So, 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 --continue
If I revert --continue without --no-commit:
git revert --continue
It 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?