Expand description
3-way merge with append-friendly conflict resolution.
Uses git merge-file --diff3 for the base merge, then post-processes
to auto-resolve append-only conflicts (where both sides added content
at the same position without modifying existing lines).
Functionsยง
- merge_
contents - 3-way merge using
git merge-file --diff3. - merge_
contents_ crdt - CRDT-based merge: conflict-free merge using Yrs CRDT.