Peaker/git-mediate

The Git client that actually resolves conflicts: 8 deterministic patterns auto-resolve the ones that were never decisions, full trace on the rest. Native (Tauri 2 + Rust), free, MIT.

Terminal-native 3-way git mergetool and diff viewer

💤 A utility tool powered by fzf for using git interactively.

A tool to automatically resolve Git conflicts that occur in Xcode project files

Catch intent conflicts before code conflicts. The open-source coordination protocol for coding agents, built above Git.

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

Review and refine Git diffs before you push

Simplify your Git workflow with visual feedback, keyboard-driven controls, and a streamlined experience.

Git primitives for autonomous coding agents