rebase -i: Retain user-edited commit messages after squash/fixup conflicts