When a Clean Merge Is Wrong

Not mentioned in the article, this affects git rebase as well - but there you don't even get a merge commit to point to the risky change.