Avoiding the merge trap

The real fun comes when someone (usually me) comes out from some bisection session ending up on some "fix things" commit asking why this seemingly unrelated thing was changed with everything else. Bonus points when it's from 5+ years ago. That assumes the bisection even worked because of such "fix compile" commits cluttering the history (forcing merge commits at least lets `--first-parent` skip over unrelated broken topics while traversing the history).

But we're also probably "larger" and also have community contributions that make it hard to go and ask the author for open-ended fix work sometimes.