Hacker News new | ask | show | jobs
by drewcoo 1222 days ago
If you have . . .

- a merge process that happens on CI

- and that takes some time, running checks on the merge branch with main merged into it to effectively test what main will be

- and you want to make sure that there's no contention, so you finish one merge before testing the next

then you effectively have a merge lock in CI.

And that can lead to merge convoys where lots of merges to main line up and take a long time.