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 →Skip to content
v2.17.0 · Open Source · MITThe Git client that
The Git client that
resolves conflicts for you.
GitWand classifies every merge conflict using 10 deterministic patterns and per-hunk confidence scoring. The trivial 95% — auto-resolved. The complex — left for you with full traces. Native, free, open-source.
macOS · Linux · Windows
Three pillars, one promise
Auto-resolved conflicts, native performance, opt-in and auditable AI.
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 →Merge conflicts, resolved automatically
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
10 patterns. Deterministic. Auditable.
Every hunk runs through the classifier. Each pattern has its own confidence profile and automatic resolver.
same_changecertainBoth branches made the exact same edit.
⚡ Auto-resolved
one_side_changecertainOnly one branch touched this block.
⚡ Auto-resolved
non_overlappinghighAdditions at different positions in the block.
⚡ Auto-resolved
whitespace_onlyhighSame logic, different indentation or spacing.
⚡ Auto-resolved
reorder_onlyhighSame lines, different order.
⚡ Auto-resolved
insertion_at_boundaryhighNew lines added at the edge of a hunk.
⚡ Auto-resolved
value_only_changehighA scalar value (JSON, config) updated on one side.
⚡ Auto-resolved
section_only_changehighA document section edited on one side only.
⚡ Auto-resolved
llm_proposedmediumLLM-proposed resolution above the confidence threshold.
⚡ Auto-resolved
complexlowOverlapping edits — surfaced with full classification trace.
○ Review needed
New in v2.13
AI code review, inline — right in your PR diff
Select a hunk in the Review panel, request a targeted rewrite, and accept in one click. Prompt presets add instant context across every AI feature.
Everything you need for Git
A complete workflow with no performance compromise.
Smart resolution
10 resolution patterns with pattern registry (v1.4) and confidence scoring. 95%+ of trivial conflicts resolved without intervention.
Integrated Pull Requests
Review GitHub PRs directly in the app. Comments, reviews, CI status, and conflict preview.
Visual diff
Unified diff viewer with syntax highlighting, hunk-level staging, and merge preview.
Folder tree diff
Flat ↔ tree toggle in the commit file list with per-folder aggregates, click-to-filter, and a resizable sidebar that remembers its width.
Split a commit by hunks
Break a commit in two by picking files and lines. Blocks merge commits, preserves your selection across collapse/expand, and handles added/deleted/renamed files.
Tags manager
List, create, push, and delete local and remote tags. AI-powered suggestion for the next semantic version from your commit history.
Numbers, not adjectives.
Performance measured on an M-series chip with typical repositories.
249kops/sec
1 conflict · ~30 lines · M-series
40kops/sec
5 conflicts · ~140 lines
4.5kops/sec
50 conflicts · ~1350 lines
~8MB
Binary size — vs ~150MB Electron
322tests
Engine · CLI · App · all passing
0
Hallucinations — fully deterministic
MCP Server · Official Registry · stdio · No API key
Your AI agents in the loop
GitWand's MCP server exposes its conflict engine to AI agents. GitWand resolves the trivial — your agent takes over for the complex cases.
1
Preview
The agent calls gitwand_preview_merge to assess the number of conflicts, their complexity, and the percentage GitWand can resolve on its own.
2
Auto-resolve
GitWand instantly resolves trivial patterns (whitespace, one-side-change, same-change…) and returns ambiguous hunks with their classification trace.
AI
AI resolution
For each complex conflict, the agent has full context: ours/theirs/base content, classification trace, and confidence scores.
{ "mcpServers": { "gitwand": { "command": "npx", "args": [ "@gitwand/mcp", "--cwd", "/path/to/repo" ] } } }
Compatible with
View MCP documentation →Claude CodeClaude DesktopCursorWindsurfContinue
A Git client you'll love
Clean interface, dark theme, every Git feature in one place.
Available everywhere
macOSIntel + Apple Silicon
Linux.deb · .AppImage · .rpm
WindowsInstaller .exe · .msi
CLI npmnpm i -g @gitwand/cli
VS CodeExtension Marketplace
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?
How does GitWand compare?
Feature-by-feature breakdown against the most popular Git clients on the market.
| GitWand | GitHub Desktop | GitKraken | Fork | Tower | Sublime Merge | |
|---|---|---|---|---|---|---|
| Workflow | ||||||
| Free & open source | ✓ | ✓ | ✗ | ✗ | ✗ | ✗ |
| Native app (no Electron) | ✓ | ✗ | ✗ | ✓ | ✓ | ✓ |
| macOS | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| Linux | ✓ | ✗ | ✓ | ✗ | ✗ | ✓ |
| Windows | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| CLI tool | ✓ | ✗ | ✗ | ✗ | ✗ | ✗ |
| VS Code extension | ✓ | ✗ | ✗ | ✗ | ✗ | ✗ |
| Diff & Staging | ||||||
| Syntax highlighting | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| Hunk-level staging | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| Line-level staging | ✓ | ✗ | ~ | ~ | ✓ | ✗ |
| Side-by-side diff | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| Image diff (visual) | ✓ | ✗ | ✗ | ✗ | ✗ | ✓ |
| Folder tree diff | ✓ | ✗ | ✗ | ✗ | ✗ | ✗ |
| Conflict Resolution | ||||||
| Auto-resolve conflictsunique | ✓ | ✗ | ~ | ✗ | ✗ | ✗ |
| Confidence scoring per hunkunique | ✓ | ✗ | ✗ | ✗ | ✗ | ✗ |
| 3-way merge editor | ✓ | ✗ | ✓ | ✓ | ✓ | ✓ |
| Zero-impact merge previewunique | ✓ | ✗ | ✗ | ✗ | ✗ | ✗ |
| Proactive conflict prevention | ✓ | ✗ | ~ | ~ | ~ | ✗ |
| Power Git | ||||||
| Interactive rebase | ✓ | ~ | ✓ | ✓ | ✓ | ✓ |
| Worktrees | ✓ | ✗ | ✓ | ✓ | ✓ | ✗ |
| Submodule management | ✓ | ✗ | ✓ | ✓ | ✓ | ✓ |
| Split commit by hunks | ✓ | ✗ | ✗ | ✗ | ✗ | ✗ |
| File blame + line-range | ✓ | ✗ | ✓ | ✓ | ✓ | ✓ |
| Conventional commits | ✓ | ✗ | ✗ | ✗ | ✗ | ✗ |
| Multi-repo workspaces | ✓ | ✗ | ✓ | ✗ | ~ | ✗ |
| Cross-repo dashboard | ✓ | ✗ | ✓ | ✗ | ✗ | ✗ |
| Forge integrations | ||||||
| GitHub PRs | ✓ | ✓ | ✓ | ~ | ~ | ✗ |
| GitLab MRs | ✓ | ✗ | ✓ | ✗ | ~ | ✗ |
| Bitbucket PRs | ✓ | ✗ | ✓ | ✗ | ~ | ✗ |
| Git hooks manager | ✓ | ~ | ✗ | ✗ | ✗ | ✗ |
| AI & Agents GitWand connects to your own LLM — Claude, OpenAI-compatible, or Ollama. No built-in model. | ||||||
| AI commit messages | ✓ | ✓ | ✓ | ~ | ✓ | ✗ |
| AI conflict explanationunique | ✓ | ✗ | ~ | ✗ | ✗ | ✗ |
| AI PR description | ✓ | ✗ | ✓ | ✗ | ✗ | ✗ |
| MCP server for AI agents | ✓ | ✗ | ✓ | ✗ | ✗ | ✗ |
| Agent Sessions panel | ✓ | ✗ | ✓ | ✗ | ✗ | ✗ |
| PR activity notifications | soon | ✗ | ✓ | ✗ | ✗ | ✗ |
| Voice input (offline Whisper) | soon | ✗ | ✗ | ✗ | ✗ | ✗ |
~ partial · SOON on the roadmap · data accurate as of May 2026
Ready to simplify your Git workflow?
Free, open source, and built for developers who want to move fast.