Lock at the right granularity
Protect mutable surfaces using leases, file locks, or symbol-level ownership.
Trade-off: Fine-grained locks can reduce collisions but increase contention.
Tool / Ownership
symlock
Symbol-level locks and symbol-aware merging to reduce collisions.
The summary describes what the project says it does; inclusion is not an endorsement.
Approaches it illustrates
Detect collisions before the merge
Surface likely overlap while work is still underway, when it can still be redirected.
Trade-off: Predictions are imperfect and can themselves disrupt work.