conflict-resolution
Installation
SKILL.md
Conflict Resolution
Instructions
Any bidirectional sync has conflicts. The question is not "will we have them" but "how do we resolve them predictably". Pick a policy per entity, make it explicit, and show pending or conflicted states in the UI.
1. Conflict Models
| Model | Works by | Good for |
|---|---|---|
| Last-write-wins (LWW) | Highest timestamp wins per record | Settings, profile fields, simple data |
| Field-level LWW | Per-field timestamps merge | User profile with independently edited fields |
| Three-way merge | Base + ours + theirs -> merged | Documents, code-like content |
| Vector clocks | Track causality | Systems with unreliable clocks |
| CRDTs | Conflict-free data types | Collaborative docs, shared sets |
| Manual | Ask the user | Irreducible conflicts, high-stakes data |