# GitWand MCP server

> Automates trivial Git merge conflict resolution and provides AI-assisted workflows for branch management, pull requests, and code reviews.

- Repository: https://github.com/devlint/GitWand
- Page: https://hostedmcp.org/servers/devlint/gitwand
- Transport: stdio
- Stars: 196
- License: MIT
- Latest version: 3.13.1

## Install

### Claude Code

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

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

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

### VS Code (`.vscode/mcp.json`)

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

### Claude Desktop (`claude_desktop_config.json`)

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

### Codex (`~/.codex/config.toml`)

```toml
[mcp_servers.gitwand]
command = "npx"
args = ["-y", "@gitwand/mcp"]
```

### Gemini CLI (`~/.gemini/settings.json`)

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

## Environment variables

| Name | Required | Secret | Description |
|---|---|---|---|
| `WEBKIT_DISABLE_COMPOSITING_MODE` | no | no |  |

## Tools (7)

- `gitwand_status`
- `gitwand_resolve_conflicts`
- `gitwand_preview_merge`
- `gitwand_explain_hunk`
- `gitwand_apply_resolution`
- `gitwand_resolve_hunk`
- `gitwand_resolve_hunk_llm`

## FAQ

### Which git hosting providers are supported?

GitWand supports GitHub, GitLab, Bitbucket, Azure DevOps, Gitea, and Forgejo.

### Can I use GitWand with AI agents?

Yes, it includes an Agents panel for MCP sessions and allows you to launch AI agents like Claude Code in isolated worktrees.

### Does GitWand require the GitHub CLI?

No, it uses OAuth device-flow for GitHub and Azure DevOps, meaning no gh CLI is required for those workflows.

### How can I install GitWand on Windows?

You can download the installer from GitHub Releases or use the winget package manager.