GitWand

GitWand is a free, open source Git client that automatically resolves merge conflicts using 10 deterministic patterns and per-hunk confidence scoring. It resolves 95%+ of trivial conflicts instantly, so you only review the truly complex ones. Built with Tauri 2 + Rust (no Electron), it starts in under 1 second and offers a full Git workflow: visual diff, hunk-level staging, interactive rebase, worktrees, integrated GitHub PRs, and more. For complex conflicts, GitWand includes an opt-in, auditable LLM fallback supporting Claude, OpenAI, and Ollama — using your own key. It also ships an MCP server so AI agents (Claude Code, Cursor, Windsurf…) can resolve conflicts directly. Available on macOS, Linux, Windows, as a CLI (npm), and as a VS Code extension.