# Gitwand

> Gitwand is an MCP server for developer tools. Merge-conflict resolver for coding agents that leaves only complex hunks to review. It runs locally on your machine and is started by your AI client.

- **Kind:** MCP server
- **Platforms:** CLI, macOS, Windows, Linux
- **Repository:** https://github.com/devlint/gitwand
- **MCP Registry name:** io.github.devlint/gitwand
- **Categories:** [developer tools](https://ai-powered.com/categories/developer-tools)
- **Listing updated:** 2026-11-18

## About

Conflicts that follow a simple pattern are fixed automatically, and an agent connected through this server is left with only the hunks that need judgment. The registry entry describes the npm package `@gitwand/mcp`, which runs locally over stdio.

It comes from GitWand, a Git client built with Tauri 2 and Vue 3. The README describes a conflict engine that predicts a merge before it happens, using `git merge-base`, `git show` and `git merge-file -p --diff3`, then sorts each file as auto-resolvable, partial, manual or add/delete. The desktop app also has an Agents panel that shows active MCP sessions and can launch Claude Code, so an agent's edits show up live in the diff viewer.

The README covers the wider GitWand app far more than the MCP package, and it does not list the MCP tool names, so check the package itself before relying on a specific call.

## Features

- **Automatic conflict resolution:** Resolves trivial merge conflicts so only the harder hunks are left to a person or agent.
- **Merge preview:** Predicts a merge without touching the working tree and labels files as auto-resolvable, partial, manual or add/delete.
- **Local stdio server:** Runs as the npm package @gitwand/mcp on your machine rather than as a hosted service.
- **Agent sessions panel:** The GitWand desktop app lists active MCP sessions and shows an agent's changes live in the diff viewer.
- **Isolated worktrees for agents:** The app can open an AI task in a scratch git worktree and merge the work back or delete it afterwards.

## Good for

- Let a coding agent finish a rebase without hand-resolving trivial conflicts
- Check how clean a merge will be before running it
- Review only the conflict hunks that need human judgment
- Watch an agent's edits appear in a diff viewer while it works

## Install

### Claude Code (Terminal)

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

### Claude Desktop (claude_desktop_config.json)

```json
{
  "mcpServers": {
    "gitwand": {
      "command": "npx",
      "args": [
        "-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"
      ]
    }
  }
}
```

### Windsurf (~/.codeium/windsurf/mcp_config.json)

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

### Other clients (your client's MCP settings (most use this shape))

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

## FAQ

### How does the server run?

It is an npm package, @gitwand/mcp, that talks to the client over stdio.

### Does it need a remote service or credentials?

The registry entry lists no remote endpoint and no environment variables.

### What is GitWand itself?

A native Git client built with Tauri 2 and Vue 3 with a Git Tree history view, pull request review across several forges and a built-in conflict engine.

### How do I add Gitwand to Claude Code?

Run this command in your terminal: claude mcp add gitwand -- npx -y @gitwand/mcp

### What are the best alternatives to Gitwand?

The closest alternatives to Gitwand are REA, Context7, Chrome DevTools MCP, Codebase Memory and GitHub.

## Where this comes from

- Description: written from the project's README.
- Install steps: from the official MCP Registry entry.

## Alternatives

- [REA](https://ai-powered.com/mcp/rea): REA is an open-source MCP server for developer tools.
- [Context7](https://ai-powered.com/mcp/context7): Context7 is a freemium MCP server for developer tools.
- [Chrome DevTools MCP](https://ai-powered.com/mcp/chrome-devtools-mcp-2): Chrome DevTools MCP is an open-source MCP server for browser automation.
- [Codebase Memory](https://ai-powered.com/mcp/codebase-memory): Codebase Memory is an open-source MCP server for knowledge and memory.
- [GitHub](https://ai-powered.com/mcp/github-2): GitHub is an open-source MCP server for developer tools.
- [Serena MCP: the IDE for your agent](https://ai-powered.com/mcp/serena-mcp-the-ide-for-your-agent): Serena MCP: the IDE for your agent is an open-source MCP server for developer tools.
- [awesome-mcp-servers](https://ai-powered.com/mcp/awesome-mcp-servers-2): awesome-mcp-servers is an open-source MCP server for developer tools.
- [XERJ](https://ai-powered.com/mcp/xerj): XERJ is an open-source MCP server for knowledge and memory.

---
Source: https://ai-powered.com/mcp/gitwand
