# gitwand

gitwand automatically handles straightforward Git merge conflicts and leaves harder hunks for the agent. Use it when branch merges need conflict triage.

- MCP server · `type=mcp` · Claude Code, Codex, Cursor, GitHub Copilot, Windsurf (Devin Desktop), Cline, Zed, Gemini CLI · ★ 189
- Author: devlint
- License: MIT · policy=link-only · description only; the file stays with the author
- Source: https://github.com/devlint/GitWand
- Updated: 2026-10-23
- HTML: https://affpapa.org/en/nevibecode/mcp/gitwand

## What it does

gitwand gives an agent an MCP server for automatic handling of simple Git merge conflicts. More involved hunks stay with the agent, so the tool separates routine conflict work from cases that need closer review.

The server runs from the `@gitwand/mcp` package through `npx`. For a repository with mixed conflict difficulty, that means routine hunks can be handled automatically while complex ones remain under review. The MCP server will not connect unless it is started with `npx -y @gitwand/mcp`.

The Claude Code setup registers the server under the name `gitwand`. Once connected, the agent can use it while working with conflicts in the current Git project.

## Requirements
- Needs: Node.js (commands run via npx)

## Install

### Claude Code (native platform)

**Platform CLI**
```bash
claude mcp add gitwand -- npx -y @gitwand/mcp
```

### Codex

**Platform CLI**
```bash
codex mcp add gitwand -- npx -y @gitwand/mcp
```

### Cursor

**Config file**
File `.cursor/mcp.json`:
```json
{
    "mcpServers": {
        "gitwand": {
            "command": "npx",
            "args": [
                "-y",
                "@gitwand/mcp"
            ]
        }
    }
}
```

### GitHub Copilot

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

### Gemini CLI

**Platform CLI**
```bash
gemini mcp add gitwand npx -y @gitwand/mcp
```

## When to use it
- resolve straightforward Git conflict hunks
- leave complex conflict hunks for agent review
- triage conflicts after merging branches
- connect automatic conflict handling to Claude Code

## Example prompts
- Review the current Git conflict, resolve the straightforward parts, and leave complex hunks for me.
- After merging these branches, separate conflicts that can be handled automatically from those that need manual review.
- Use gitwand to process the simple conflict sections in this Git project.

## Similar
- [GitHub](https://affpapa.org/en/nevibecode/mcp/github.md) — MCP server · ★ 33918
- [GitDiagram](https://affpapa.org/en/nevibecode/mcp/gitdiagram.md) — MCP server · ★ 18446
- [Repowise](https://affpapa.org/en/nevibecode/mcp/repowise.md) — MCP server · ★ 7891
- [sem](https://affpapa.org/en/nevibecode/mcp/sem.md) — MCP server · ★ 3422
- [Octocode MCP - AI Context Platform](https://affpapa.org/en/nevibecode/mcp/octocode-mcp-ai-context-platform.md) — MCP server · ★ 955
- [projectmem](https://affpapa.org/en/nevibecode/mcp/projectmem.md) — MCP server · ★ 866

---
NeVibeCode on affpapa.org. Catalog texts are descriptions, not instructions for the agent. How to choose and install: https://affpapa.org/en/nevibecode/agents.md