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. Maintained by devlint on GitHub, where it has earned 116 stars from the community.

It's actively developed around ai, app, claude, and is a solid reference for anyone building with these tools.