> The next easiest win would be to use the weave algorithm for non-rebase merges. The weave is essentially a CRDT, but invented in 1977 by SCCS. Anyone intere

> The next easiest win would be to use the weave algorithm for non-rebase merges. The weave is essentially a CRDT, but invented in 1977 by SCCS. Anyone interested in weaves should consider modern CRDT tech. I've been keeping some notes on the correspondence within the Braid.org group (e.g. https://braid.org/meeting-60/sccs-is-a-time-collapse https://braid.org/meeting-60/sccs-is-a-time-collapse) and encourage anyone interested to reach out!