Just to clear something up: CRDTs, op transforms etc. only work well when your collaboration is near real-time. The oft-cited "work off-grid for two weeks and magically sync your work with everyone else" doesn't really work out in real life. You will need merge and diff tools. The equivalent of CRDT's behavior would be to merge git conflicts by time — whoever commits first gets merged.

Thanks, that was so much easier to read than some long-winded narrative about it.