Minimal repo to demonstrate the fact that git can't automatically rebase a branch that contains solved merge conflicts