GitWand

by devlint · Developer Tools · ★ 188

GitWand is an MCP server by devlint. The Git client that actually resolves conflicts: 8 deterministic patterns auto-resolve the ones that were never decisions, full trace on the rest. Native (Tauri 2 + Rust), free, MIT. It has 188 GitHub stars and ranks #381 of 2217 in Developer Tools by stars.

Category: Developer Tools
Author: devlint
GitHub stars: 188
This week: Tracking since 18 Oct 2026
Weekly downloads: 316
Language: TypeScript
License: MIT (open source)
Last update: 2026-10-23 (yesterday)
Links: Source Website npm

ai
app
claude
cli
codex
conflict-resolution
developer-tools
diff
gemini
git
git-client
git-gui
+8 more

How to install GitWand

GitWand is published on npm as @gitwand/mcp, and it is listed in the official MCP Registry. These steps assume it runs as a local stdio server, which is the usual setup.

Check the README. Confirm the start command and note any API keys or environment variables it needs (pass them with -e KEY=value or an env block). You need Node.js for npx.

Add it to Claude Code from a terminal:

claude mcp add GitWand -- npx -y @gitwand/mcp

Or add it to Cursor or Claude Desktop in .cursor/mcp.json or claude_desktop_config.json:

{
  "mcpServers": {
    "GitWand": {
      "command": "npx",
      "args": [
        "-y",
        "@gitwand/mcp"
      ]
    }
  }
}

Restart the client and check it. Run claude mcp list, or open the client's MCP settings, and confirm GitWand and its tools are listed. The install guide covers VS Code and Codex.

Also listed in

Maintain this project? Get it featured ($99/mo, pinned at the top of Developer Tools) or see what featuring includes.

Report a problem with this listing

Frequently asked questions

What is GitWand?

GitWand is an MCP server by devlint in the Developer Tools category. The Git client that actually resolves conflicts: 8 deterministic patterns auto-resolve the ones that were never decisions, full trace on the rest. Native (Tauri 2 + Rust), free, MIT. It has 188 GitHub stars and ranks #381 of 2217 in Developer Tools by stars.

Is GitWand free and open source?

Yes. GitWand is published under the MIT license, so you can run, modify and self-host it at no cost. If it connects to a paid service, that service's own pricing and API terms still apply. Check the repository for the exact license text before using it commercially.

What are the alternatives to GitWand?

Other Developer Tools projects on MCP Harbor include rea, storybook, context7. Each alternative links to its own page with stars, license and recent activity. The Developer Tools category ranks all 2217 by stars, and you can re-sort it by growth this week.

Alternatives to GitWand

reaTrending★ 374,738

morluto · TypeScript+72,150 stars this week (+23.8%)

Reverse engineer anything with agents, from app behavior down to native binaries.

storybook★ 91,361

storybookjs · TypeScript

Storybook is the industry standard workshop for building, documenting, and testing UI components in isolation

context7Trending★ 63,566

upstash · TypeScript+372 stars this week (+0.6%)

Context7 Platform -- Up-to-date docs for AI agents

GitNexus★ 48,013

abhigyanpatwari · TypeScript

GitNexus: The Zero-Server Code Intelligence Engine

codebase-memory-mcpTrending★ 47,372

DeusData · C+622 stars this week (+1.3%)

Local code intelligence for developers and AI agents. Connect code, docs and infrastructure in a persistent graph, with CBM Lens, MCP tools, agent integrations and change-aware test selection.

github-mcp-server★ 33,909

github · Go+219 stars this week (+0.7%)

GitHub's official MCP Server

All 2217 Developer Tools MCP servers →

Data last updated 25 October 2026. Stars and downloads are refreshed every day from GitHub and npm.