devlint/gitwand/gitwand-mcp

GitWand MCP Server

Use GitWand's MCP server to automatically resolve Git merge conflicts from any AI agent (Claude, Claude Code, Cursor, Windsurf, etc.).

Install

npx @gitwand/mcp

Or add to your MCP client config (Claude Desktop, Claude Code, etc.):

{
  "mcpServers": {
    "gitwand": {
      "command": "npx",
      "args": ["@gitwand/mcp"]
    }
  }
}

Tools

Resources

Recommended Workflow

1. `gitwand_preview_merge` — check what can be auto-resolved vs. needs attention
2. `gitwand_resolve_conflicts` — auto-resolve trivial conflicts (writes files)
3. For each hunk in pendingHunks:

• `gitwand_explain_hunk` — understand why it's complex (DecisionTrace, ours/theirs/base)
• Decide on resolution, then `gitwand_apply_resolution` to write it

Merge Policies

Pass policy to gitwand_resolve_conflicts:

• prefer-theirs (default) — take the incoming branch's version when safe
• prefer-ours — favour the current branch
• prefer-merge — attempt a three-way merge
• prefer-safety — only resolve with very high confidence
• strict — resolve only non-overlapping / whitespace-only conflicts

Documentation

• Guide: https://gitwand.app/guide/mcp
• npm: https://www.npmjs.com/package/@gitwand/mcp
• GitHub: https://github.com/devlint/GitWand