3 ms·
I agree with this. The correct way of resolving conflicts is different depending on both the semantics of the document and the context in which the conflict aro
by kybernetikos 8y ago
I agree with this. The correct way of resolving conflicts is different depending on both the semantics of the document and the context in which the conflict arose.
For example, I think the CRDT approach is probably applicable to most examples of interactive editing, where incorrect conflict resolutions will happen near a point of focus for one of the editors and can be quickly and easily resolved.
If you have wildly divergent documents however (again depending on the document type itself), this is not really the same case, and it's much more likely that a human will need to create a resolved document by consulting the two parent documents.