I would just abort the conflict resolution.

Then you’re back to the state before the rebase. Which is fine, the point is just that they’re not equivalent!

Yes. What's the equivalent would be to just keep the successfully rebased part. Right now you need to do keep the ref yourself.

> Sounds like something that could also become a flag for git merge.