I think that the fact that the head of the self-conflict branch has two parents branched from a common base (with a bunch of commits in between) has something to do with it.
I guess I’m rebasing it to a single commit, which conflicts with its history.
I think that the fact that the head of the
self-conflict
branch has two parents branched from a common base (with a bunch of commits in between) has something to do with it.I guess I’m rebasing it to a single commit, which conflicts with its history.