Conflict resolution: User and state model

Defines a three-way conflict model for collaborative records, preserving base, local intent, and current remote state while distinguishing mergeable fields from invariants that require a user decision.

How to write a block

发布于 Sep 12, 2026