GitWand

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

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