Gitwand

Overview

Gitwand is a Model Context Protocol server that automatically resolves Git merge conflicts, allowing agents to focus only on complex hunks that require human judgment. It integrates seamlessly with AI assistants by exposing conflict resolution as callable tools, eliminating the need to manually copy data between applications.

The server runs locally via the npm package @gitwand/mcp and requires no authentication or external credentials. It communicates with your system over stdio and is ready to use immediately after installation. The latest release is v3.9.0, distributed under the MIT license, with source code available at devlint/GitWand on GitHub where the project has reached 167 stars.

Gitwand belongs to the Version Control category on mcp.site and works with all major MCP clients including Claude Desktop, Claude Code, Cursor, VS Code, Windsurf, and Zed. If you maintain this project for devlint, you can claim this listing to verify your ownership, display a verified badge, and keep information up to date.

Installation

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