#Merge-conflicts

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.

ghuntley

rizzler

rizzler: stop crying over Git merge conflicts and let AI handle the drama

clash-sh

clash

Avoid merge conflicts across git worktrees for parallel AI coding agents

pprice

vscode-better-merge

Better merge conflict support for vscode

amaar-mc

wit

Agent coordination protocol — declare intents, lock symbols, detect conflicts before code is written