Wow, I’ve never seen this before. This repo has a merge conflict with its own base commit:
$ git rebase HEAD^
Auto-merging dateutil/test/test_imports.py
…
error: could not apply ffc4be1… Use pytest
Follow
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.
