Re:CRDTs are the future
by boleary-gl on Tuesday September 29, 2020 @01:05PM
(#24630272)
GitLab team-member here.
GitLab also detects if there is a conflict on a merge request as things change and will notify the user
The main difference would be that the PR check only compares with master, and you'd want to compare all branches. But a low-constant-factor test for collisions would make that cheap enough (conflicts can only occur for commits that contain the same file names, which is an O(mlogm) set intersection test of short text strings)