Digital collaboration systems support asynchronous work over replicated data, where conflicts arise when concurrent operations cannot be unambiguously integrated into a shared history. While Conflict-Free Replicated Data Types (CRDTs) ensure convergence through built-in conflict resolution, this resolution is typically implicit and opaque to users, whereas existing reconciliation techniques often rely on centralized coordination. This paper introduces a conflict model for collaborative data structures that enables explicit, local-first conflict resolution without central coordination. The model identifies conflicts using semantic dependencies between operations and resolves them by rebasing conflicting operations onto a reconciling operation via a three-way merge over a replicated journal. We demonstrate our approach on collaborative registers, including an explicit formulation of the Last-Writer-Wins Register and a multi-register entity supporting semi-automatic reconciliation.

翻译：数字协作系统支持基于副本数据的异步工作，当并发操作无法明确整合到共享历史记录时就会产生冲突。虽然无冲突复制数据类型（CRDTs）通过内置冲突解决机制确保最终一致性，但这种解决方式通常对用户是隐式且不透明的，而现有的协调技术往往依赖于集中式协调机制。本文提出一种用于协同数据结构的冲突模型，该模型支持显式的、本地优先的冲突解决，且无需中央协调。该模型通过分析操作间的语义依赖关系来识别冲突，并借助副本日志的三方合并机制，将冲突操作重新定位到协调操作上实现冲突消解。我们在协同寄存器上验证了该方法的有效性，包括对"最后写入获胜"寄存器的显式形式化描述，以及支持半自动协调的多寄存器实体实现。