Git, without
the headaches.
GitWand is a native Git client with smart merge conflict resolution. Desktop, CLI, and VS Code extension — one tool, everywhere.
macOS · Linux · Windows
Everything you need for Git
A complete workflow with no performance compromise.
Native performance
Built with Tauri 2 and Vue 3. Sub-second startup. Zero Electron overhead.
Smart resolution
10 resolution patterns with pattern registry (v1.4) and confidence scoring. 95%+ of trivial conflicts resolved without intervention.
Visual diff
Unified diff viewer with syntax highlighting, hunk-level staging, and merge preview.
History & Graph
Full history, interactive DAG graph, file blame, and natural-language commit search.
Integrated Pull Requests
Review GitHub PRs directly in the app. Comments, reviews, CI status, and conflict preview.
3 interfaces
Desktop app (macOS/Linux/Windows), gitwand resolve CLI for CI/CD, and VS Code extension.
AI code review & PR
Auto-generated PR title and description, per-hunk AI critique in the Review panel, branch-name suggestions from the diff.
AI merge insight
Plain-English conflict explanation, AI risk summary before rebase/merge, semantic squash in interactive rebase.
AI commit & history
Generated commit and stash messages, semantically-ranked Absorb, blame context and release notes from git log.
Visual image diffs
Compare PNG, JPG, WebP, GIF, and SVG changes side-by-side, overlayed, blinked, or with a reveal slider. No more "Binary file changed".
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.
Git Worktrees
Work on multiple branches simultaneously without stashing. Each worktree opens as a tab. Create one from the branch list with one click.
Submodule management
List, initialize, and update Git submodules with status badges. Add submodules and open them as tabs directly from the panel.
MCP server
Expose GitWand to Claude, Cursor, Windsurf, and any MCP client. One command: npx -y @gitwand/mcp. Published with provenance.
Merge conflicts, resolved automatically
GitWand analyzes code semantics, not just lines. It picks the right resolution for you.
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.
Preview
The agent calls gitwand_preview_merge to assess the number of conflicts, their complexity, and the percentage GitWand can resolve on its own.
Auto-resolve
GitWand instantly resolves trivial patterns (whitespace, one-side-change, same-change…) and returns ambiguous hunks with their classification trace.
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" ] } } }
A Git client you'll love
Clean interface, dark theme, every Git feature in one place.
Available everywhere
Frequently asked questions
Ready to simplify your Git workflow?
Free, open source, and built for developers who want to move fast.