4 ms·
> Not realistic when working on a code base where PRs are being squash-merged every hour and the code review lasts for days. But if they collide, you have to r
by FeepingCreature 3y ago
> Not realistic when working on a code base where PRs are being squash-merged every hour and the code review lasts for days.
But if they collide, you have to resolve all the merge conflicts anyway, and then with rerere you should have relatively little additional work on the final rebase.