Avoiding the merge trap

Posted May 12, 2023 16:51 UTC (Fri) by rep_movsd (guest, #100040)
In reply to: Avoiding the merge trap by adobriyan
Parent article: Avoiding the merge trap

We do that, but in 9 years we havent ever rummaged through the commit history more than a couple of times because it's a small team and quite obvious when and where something changed and who did it

to post comments

Avoiding the merge trap

Posted May 14, 2023 23:18 UTC (Sun) by mathstuf (subscriber, #69389) [Link]

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.