#Conflict-resolution

YousefED

SyncedStore

SyncedStore CRDT is an easy-to-use library for building live, collaborative applications that sync automatically.

mkchoi212

fac

Easy-to-use CUI for fixing git conflicts

Ataraxy-Labs

weave

Entity-level git merge driver. Resolves false conflicts git invents when independent agents edit the same file. ~95% reduction vs. line-based merge.

chojs23

ec

Easy terminal-native 3-way git mergetool vim-like workflow

devlint

GitWand

The Git client that actually resolves conflicts — 10 deterministic patterns auto-resolve the trivial 95%, full trace on the rest. Native (Tauri 2 + Rust), free, MIT.