v3.11 — the File Explorer becomes a Finder-like file browser →

The merge ends without you.

Name: GitWand
Author: Devlint

Eight deterministic patterns classify every hunk, settle the ones that carried no decision, and hand you back only what deserves your attention. Native, local, MIT.

Download GitWand

hunks settled in the last merge

0.9 s

to classify all of them

1662

real merges replayed in tests

myapp — merge feature/settings56 settled · 1 for you_

In under a second

This conflict was never a decision.

GitWand reads the semantics of the code, not just the lines. It recognises the pattern, applies the resolution and keeps the trace. You can read it back, replay it, challenge it.

How the engine works →

src/theme.tshunk 1 / 57

<<<<<<< HEAD

const theme = 'dark'

=======

const theme = localStorage.getItem('theme') ?? 'dark'

>>>>>>> feature/settings

✓ prefer-theirs · confidence 97% · semanticsee the trace →

Deterministic where the others guess

Six reasons to keep it open all day.

Deterministic

A score and a trace for every hunk

Not one line was guessed. Every resolution is auditable, and replayable exactly.

0 hallucinations

Native

~8 MB

Tauri 2 + Rust. Starts in under a second, not 150 MB of Electron.

Keyboard

⌘Keverything from the keyboard, nothing to hunt for

Local

100%

Your code stays on your machine. No account, no telemetry.

MCP server

The same engine, wired into your agents

Claude CodeCursorWindsurfContinue

Free

MIT

No seat licence, no trial wall, no account.

resolution patterns

1662

real merges replayed

interfaces, one engine

hallucinations

The eight patterns

Registry v1.4, per-hunk confidence scoring.

whitespace_only

Two indentation styles go in, one comes out.

same_change

You were both right, identically.

one_side_change

Only one side touched the area.

reorder_only

The imports moved, the code did not.

insertion_at_boundary

Two additions at the hunk edges, no overlap.

06 · 07 · 08

+3 in the registry

Orchestrated by a versioned pattern registry.

One engine, three ways to use it

Same resolutions, same traces, everywhere.

Desktop app

Graph, diffs, PRs, worktrees and the day’s inbox in one native window.

$ gitwand merge feature/settings

✓ 56 hunks resolved

⚑ 1 hunk for you — api/client.ts

→ trace: .gitwand/traces/merge.json

CLI

Scriptable, CI-friendly, full JSON output.

VS Code extension

The engine where you already write, without switching windows.

MCP · official registry · stdio · no API key

Your agents are good at code. Bad at merges.

The MCP server settles the hunks that carry no decision and hands the hard cases to the agent with the full context: ours, theirs, base and the trace.

Explore AI agents →

# one command is enough

claude mcp add gitwand \

-- npx -y @gitwand/mcp

Against the other clients

Full comparison →

GitWandGitHub DesktopGitKraken

Deterministic auto-resolve✓✗AI only

Free / open source✓✓✗

Native (no Electron)✓✗✗

MCP server for agents✓✗✓

Available everywhere

v3.11.0 — MIT

macOSIntel + Apple Silicon Linux.deb · .AppImage · .rpm WindowsInstaller .exe · .msi · winget 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?

From the blog

September 21, 2026 · 9 min read

Three outcomes, not two: what went into GitWand v3.11

The Conflict Predictor stopped predicting and started running the merge, stopping on what needs a person. And a two-line bug report about an "Abort merge" button that lied led to the real fix: an operation ends three ways, not two. It completes, it halts on a further conflict, or it fails.

Read article →

Contributors