[jongjong]

Yep, the combined intent of two people cannot be established automatically when they cannot see each other's changes or understand each other's reasoning. Figuring out the collaborative intent for conflict resolution would require mind-reading.

The right UX for scenarios where accuracy is essential is to let users know when they are offline. The offline-enabled approach is not suitable for a lot of situations.

[WorldMaker]

As someone I trusted in source control once pointed out: often the source of a conflict may be social or political or miscommunication. As much as we all want technical solutions for sociopolitical problems, the real answer is still often communication and that any {source control; collaborative editing; etc} tool is only as good as its merge conflict UX is at communication between involved parties.

I think we've gone far enough down the road of "we can solve all CRDT merge conflicts through technical wizardry" that the next steps are "what is the right merge conflict UX when people should be communicating?" not just "what can we solve technically and never show the user?"