Gitwand

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

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

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

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

Config formats checked against the official docs on Oct 7, 2026: modelcontextprotocol.io (opens in a new tab), code.claude.com (opens in a new tab), cursor.com (opens in a new tab), code.visualstudio.com (opens in a new tab).

• 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

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

• app
• cli
• diff
• git
• mcp
• merge
• tauri
• vue
• webapp
• claude