It looks like it's possible to reach an unresolvable dead-end situation by amending a merge commit. For a use-case see this issue at Stack Overflow: https://stackoverflow.com/questions/74032523/how-can-i-rebase-this-git-branch-on-master/74064773 Is this situation desired? Shouldn't git rather emit an error message when trying to amend a merge commit?