0
0 hallucinations
A confidence score and a decision trace for every hunk — never a guess.
Skip to content
New in v3.2 — integrated terminal built for AI agents & file editor in your Git client→Merge conflicts end here.
Merge conflicts end here.
Get your flow back.
That sinking feeling when 12 files turn red? Gone. GitWand classifies every hunk with 10 deterministic patterns — no guessing, no hallucinations — auto-resolves the trivial 95%, and hands you only what's worth your brain. Native, free, MIT.
- 10 deterministic patterns — zero gambling with your code
- 100% local — your code never leaves your machine
- One engine — Desktop, CLI, VS Code & AI agents
macOS · Linux · Windows
See it resolve a conflict in one second
GitWand analyzes code semantics, not just lines. It picks the right resolution for you.
Before — raw conflict
<<<<<<< HEAD
const theme = 'dark'
=======
const theme = localStorage.getItem('theme') ?? 'dark'
>>>>>>> feature/settings
GitWand
After — auto-resolved
const theme = localStorage.getItem('theme') ?? 'dark'
Confidence 97% · prefer-theirs · semantic
Three pillars, one promise
Conflicts resolved deterministically, performance that's actually native, and AI that only steps in when you ask.
Auto-resolve 95% of trivial conflicts
10 deterministic patterns. Composite confidence scoring. Decision traces for every hunk.
95%trivial conflicts auto-resolved
See the engine →Tauri 2 + Rust. Native, fast, predictable.
Lazy-loaded panels. libgit2 fast-path. Polling discipline. No Electron bloat.
<1scold start
Why native →AI assists where humans get stuck
LLM fallback for complex hunks. MCP server for agents. Always opt-in, always audited.
Claude · OpenAI · Ollamayour LLM, your key
AI fallback guide →A Git client you'll actually want to open
Every Git action in one fast, native window — the commit graph, diffs, pull requests, worktrees, and your Today inbox.
Deterministic where others guess
Four reasons GitWand isn’t just another Git GUI.
MIT
Free · MIT
Fully open source. No seat pricing, no trial wall, no account.
~8 MB
~8 MB, native
Tauri 2 + Rust. Sub-second start, not 150 MB of Electron.
MCP
MCP for agents
Your resolution engine, on tap for Claude Code, Cursor and any MCP client.
How GitWand compares
Where it is genuinely different from the popular clients.
| GitWand | GitHub Desktop | GitKraken | |
|---|---|---|---|
| Deterministic auto-resolve | ✓ | ✗ | AI only |
| Free / open source | ✓ | ✓ | ✗ |
| Native (no Electron) | ✓ | ✗ | ✗ |
| MCP server for agents | ✓ | ✗ | ✓ |
Frequently asked questions
Is GitWand really free?
How does smart conflict resolution work?
What is the MCP server and why use it?
Does GitWand work with any Git repository?
What sets GitWand apart from other Git clients?
How do I install the MCP server?
Stop refereeing merge conflicts.
Free, open source, native. Download GitWand and let the engine take the boring 95%.