gitwand

local MCP server

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"
      ]
    }
  }
}

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

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