# Gitwand (MCP server)

> 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 180 GitHub stars, is released under the MIT license and runs locally with npx -y @gitwand/mcp.

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

## Key facts

| Fact | Value |
|---|---|
| Repository | https://github.com/devlint/GitWand |
| GitHub stars | 180 |
| License | MIT |
| Language | TypeScript |
| Transport | stdio |
| Packages | npm: @gitwand/mcp |
| Remote URL | none |
| Needs API key | no |
| Official | no |
| Works with | Claude Desktop, Claude Code, Cursor, VS Code |
| Category | Developer tools |
| Latest release | v3.12.0 (Oct 6, 2026) |
| Last commit | Oct 6, 2026 |
| MCP registry name | io.github.devlint/gitwand |

## Install

### Claude Desktop (claude_desktop_config.json)

```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

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

### Cursor (.cursor/mcp.json)

```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)

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

Config formats checked against the official docs on 2026-10-07.

## Tools

- `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

## Similar MCP servers

- [Gemini CLI](https://appsgit.com/mcp-servers/gemini-cli): An open-source AI agent that brings the power of Gemini directly into your terminal. (107,240 stars, Apache-2.0)
- [Front-End Checklist](https://appsgit.com/mcp-servers/front-end-checklist): Review frontend code and live pages against 386 quality-gated web development rules. (74,390 stars, MIT)
- [Claude Flow](https://appsgit.com/mcp-servers/claude-flow): AI orchestration with hive-mind swarms, neural networks, and 87 MCP tools for enterprise dev. (74,016 stars, MIT, needs API key)
- [Codebase Memory](https://appsgit.com/mcp-servers/codebase-memory): Codebase knowledge graph for AI agents — 162 languages, sub-ms queries, 99% fewer tokens. (45,917 stars, MIT)
- [Bytedance Filesystem](https://appsgit.com/mcp-servers/bytedance-filesystem): MCP server for filesystem access. (39,206 stars, Apache-2.0)
- [GitHub](https://appsgit.com/mcp-servers/github): Connect AI assistants to GitHub - manage repos, issues, PRs, and workflows through natural language. (33,414 stars, MIT, official, needs API key)

---

Canonical page: https://appsgit.com/mcp-servers/gitwand
Source: appsgit (https://appsgit.com), the app store for github. Data from the GitHub API, refreshed nightly.
Machine access: JSON API https://appsgit.com/api/v1/apps (OpenAPI: https://appsgit.com/openapi.json), MCP server https://mcp.appsgit.com/mcp, full index https://appsgit.com/llms-full.txt.