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.
Offline edits carry stable operation identity; the server remains authoritative for conflicts, tombstones propagate deletes, and clients surface merge outcomes instead of silently dropping divergent local changes.