gitwand

local MCP server

gitwand is a local MCP server: Auto-resolves Git merge conflicts so agents only touch the complex hunks. Install it from npm as @gitwand/mcp.

Installation

Terminal

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

Run in your project folder. Add --scope user to use it everywhere.

Add to claude_desktop_config.json or .cursor/mcp.json.

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

Runtime: Node.js 18+ (runs with npx).
MCP client: Claude Code, Codex, Antigravity, Claude Desktop, Cursor or any other client that speaks MCP over stdio.

Auto-resolves Git merge conflicts so agents only touch the complex hunks.

Server	Stars	Type	API key	Runtime
gitwand	178	Local	No	npm
argon	171	Local	No	npm
World Monitor	87K	Hosted	No	None
tldraw	51K	Hosted	No	None
Codebase Memory	45K	Local	No	npm

No. The registry entry lists no keys or environment variables.

Node.js 18+ (runs with npx), plus an MCP client such as Claude Code, Codex, Claude Desktop or Cursor.

gitwand is a local MCP server distributed as the npm package @gitwand/mcp.

Run: claude mcp add gitwand -- npx -y @gitwand/mcp

Run: codex mcp add gitwand -- npx -y @gitwand/mcp

NameStars