GitWand

GitWand is a free, open-source Git client built around one idea: merge conflicts should be resolved deterministically, not guessed. Its engine classifies every conflict hunk against 10 resolution patterns (whitespace-only, same change, reorder, boundary insertion…) with per-hunk confidence scoring and a full decision trace: auto-resolving 95%+ of trivial conflicts and surfacing only the ones worth your attention. Zero hallucinations: AI is strictly opt-in, as a fallback for complex hunks (Claude, OpenAI, or local Ollama, with your own key). Built with Tauri 2 and Rust, GitWand is truly native: ~8 MB, sub-second startup, no Electron. It runs 100% locally: no account, no telemetry, your code never leaves your machine. One engine, three interfaces: a full desktop app (macOS, Linux, Windows), a CLI, and a VS Code extension. The desktop app covers the complete workflow: interactive commit graph, visual diffs (including image diffs) with hunk-level staging, branch and worktree management, submodules, blame, and Pull Request review for GitHub, GitLab, Bitbucket, and Azure DevOps. GitWand also ships a local MCP server (stdio, no API key) that puts its resolution engine at the disposal of AI agents like Claude Code, Cursor, or Windsurf: agents write code, GitWand handles the merges. Since v3.2, an integrated WebGL terminal with typed agent tabs lets you run AI tasks in isolated scratch worktrees with a managed merge-back-or-discard lifecycle, alongside a dockable file explorer and editor. Free under the MIT license.