Skip to content
appsgit

Gitwand

Gitwand is an MCP server that adds developer tools to AI assistants such as Claude Desktop, Claude Code and Cursor. Auto-resolves Git merge conflicts so agents only touch the complex hunks. It has 190 GitHub stars, is released under the MIT license and runs locally with npx -y @gitwand/mcp.

github.com/devlint/GitWand (opens in a new tab)

Data as of from the GitHub API and the official MCP registry; description from the project's repository. Report an error

View on GitHub (opens in a new tab)

Install Gitwand

Generated from the server's MCP registry entry. Replace your-value with your own values.

Claude Desktop

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

Settings > Developer > Edit Config. macOS: ~/Library/Application Support/Claude/, Windows: %APPDATA%\Claude\. Restart Claude Desktop afterwards.

Claude Code

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

Cursor

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

Project file; use ~/.cursor/mcp.json to enable it in every project.

VS Code

.vscode/mcp.json
{
  "servers": {
    "gitwand": {
      "type": "stdio",
      "command": "npx",
      "args": [
        "-y",
        "@gitwand/mcp"
      ]
    }
  }
}

Config formats checked against the official docs on Oct 7, 2026: modelcontextprotocol.io (opens in a new tab), code.claude.com (opens in a new tab), cursor.com (opens in a new tab), code.visualstudio.com (opens in a new tab).

Tools (7)

Parsed from the Tools section of the README; check the repository for the current list.

  • gitwand_status

    List conflicted files with their complexity and auto-resolvability

  • gitwand_resolve_conflicts

    Auto-resolve trivial conflicts, return DecisionTrace + pendingHunks

  • gitwand_preview_merge

    Dry-run resolution — stats and risk assessment without writing files

  • gitwand_explain_hunk

    Explain why a specific hunk was classified its type (full trace + context)

  • gitwand_apply_resolution

    Apply a custom (LLM-provided) resolution to a specific complex hunk

  • gitwand_resolve_hunk

    Ask the connected agent to propose a resolution for one pending hunk (ours/theirs/base + trace returned)

  • gitwand_resolve_hunk_llm

    Validate an LLM-proposed resolution through the post-merge gate, then apply it to disk

About Gitwand

A fast, native Git client with built-in smart conflict resolution Desktop • Conflict engine • CLI • MCP Server • Architecture • Roadmap • Code signing

  • app
  • cli
  • diff
  • git
  • mcp
  • merge
  • tauri
  • vue
  • webapp
  • claude

Similar MCP servers

More developer tools MCP servers

All Developer tools

FAQ

Gitwand FAQ

Still curious? Email info@appsgit.com.

How do I install the Gitwand MCP server?

Add the command npx -y @gitwand/mcp to your MCP client: put it in claude_desktop_config.json for Claude Desktop, run claude mcp add for Claude Code, or add it to .cursor/mcp.json (Cursor) or .vscode/mcp.json (VS Code). The snippets on this page are ready to paste.

Is Gitwand free?

The server is open source under the MIT license, so running it is free. It does not declare any required API key.

Is Gitwand actively maintained?

The most recent commit was on Oct 19, 2026. The latest release is v3.12.4, published Oct 19, 2026. appsgit only lists MCP servers with a commit in the last six months.