Log inSubmit server
Gitwand logo

Gitwand

Auto-resolves trivial Git merge conflicts while giving agents traces and controls for complex hunks.

InstallRepositoryWebsite
Full README Compare alternatives Embed widget Claim this listing

Install Gitwand

Pick your client, then add it in one click or paste the config.

STDIONode.js
~/Library/Application Support/Claude/claude_desktop_config.json
claude_desktop_config.json
{
  "mcpServers": {
    "gitwand": {
      "command": "npx",
      "args": [
        "-y",
        "@gitwand/mcp"
      ]
    }
  }
}

Settings → Developer → Edit Config, merge this into mcpServers, then fully quit and reopen Claude Desktop.

Install not yet sandbox-tested— we haven't run this command through our automated sandbox yet. Not a red flag; we're working through the catalog.

Overview

gitwand MCP server exposes Git merge-conflict analysis and resolution workflows to connected agents. It identifies conflicted files, classifies hunks by complexity, resolves eligible trivial cases, and reports pending work with decision traces. Agents can preview changes, inspect classification context, propose custom resolutions, and apply validated results. Reach for it when an agent should handle routine conflicts while keeping complex hunks available for deliberate review.

Use cases

  • List conflicted files before assigning resolution work
  • Preview merge risk without changing the working tree
  • Auto-resolve trivial conflicts and return complex hunks
  • Inspect why a conflict hunk received its classification
  • Validate and apply an agent-proposed hunk resolution

Key features

  • Conflict status and complexity reporting
  • Dry-run merge previews
  • Automatic trivial-conflict resolution
  • Decision traces and pending-hunk output
  • Hunk explanations with context
  • Validated custom and LLM resolutions

Tools7

What Gitwand lets your agent do. Expand a tool for its parameters.

Self-reported~170 tokens of context

Security & health

What it can reach and how reliably it runs — from our own checks, not the maintainer’s claims.

ActiveLast checked Today

Recent health check succeeded.

7/7 checks healthy over the last 34d

Supply-chain signal

No high-severity advisories surfaced by our automated scan.

Critical 0High 0Medium 0Low 0

Scanned 15d ago via OSV.dev · @gitwand/mcp (npm)

Adoption & maintenance

Factual signals from GitHub, npm, and our automated checks — not a rating.

GitHub stars186Stargazers on the source repository.
npm downloads1.2kPackage downloads in the last 30 days.
Last commit3d agoMost recent push to the default branch.
Tools exposed7Callable tools this server registers over MCP.
Directory activity1 viewsConfig copies, upvotes, and views on AllMCPs.

How Gitwand works

What gitwand does

gitwand MCP server focuses on Git merge-conflict handling for agent-assisted workflows. It reports which files are conflicted, indicates the complexity of each conflict, and identifies hunks that can be resolved automatically. The server separates routine work from conflicts that need an agent or human to make a more specific decision.

The gitwand MCP server can also explain an individual hunk classification. Its explanation includes the context and trace used for that classification, giving developers a way to inspect why a hunk was treated as trivial or complex rather than accepting an opaque result.

This fits the Version Control category because its operations work directly with conflicted Git state and write resolutions back to disk when explicitly requested.

How it works

A typical workflow begins with gitwand_status, which lists conflicted files together with complexity and auto-resolvability information. Before changing files, an agent can call gitwand_preview_merge to perform a dry run and receive resolution statistics plus a risk assessment.

gitwand_resolve_conflicts handles the automatically resolvable portion and returns a DecisionTrace along with pendingHunks. Those pending hunks represent work that remains for an agent or developer. The trace provides an audit of the decisions made during the automatic phase.

For a remaining complex hunk, an agent can request a proposal through gitwand_resolve_hunk. The response includes the competing ours, theirs, and base versions together with a trace. A custom answer can then be submitted with gitwand_apply_resolution, or an LLM-generated answer can be checked and written using gitwand_resolve_hunk_llm.

Tools and capabilities

  • List conflicted files and their complexity with gitwand_status.
  • Preview merge resolution without writing files using gitwand_preview_merge.
  • Resolve trivial conflicts and return pending hunks with gitwand_resolve_conflicts.
  • Explain a hunk’s classification with context and a full decision trace through gitwand_explain_hunk.
  • Apply a custom resolution to a selected complex hunk with gitwand_apply_resolution.
  • Ask the connected agent to propose a hunk resolution with gitwand_resolve_hunk.
  • Validate an LLM proposal through a post-merge gate before applying it with gitwand_resolve_hunk_llm.

Limitations and notes

It also does not state that every conflict can be resolved automatically. The workflow explicitly leaves complex or non-auto-resolvable hunks pending, so callers should review those results before considering a merge complete.

gitwand MCP server operations that apply resolutions can modify files on disk. Use the preview operation when an agent needs statistics and risk information without making changes, and use the explanation or trace outputs when a decision needs inspection. The available description does not define the exact classification rules or the post-merge gate’s validation criteria.

Read the full README View source on GitHub

Reviews

No reviews yet — be the first to share how it worked for you.

Frequently Asked Questions about Gitwand

gitwand is an MCP server that connects agents to Git merge-conflict workflows. Its main tools report conflicted files, preview resolution risk, auto-resolve trivial conflicts, explain hunk classifications, and apply custom or LLM-proposed resolutions after validation. It returns pending hunks and decision traces so complex conflicts remain reviewable.

It identifies the project as an MCP server and lists its tools, but does not specify a package, command, transport, or client configuration format.

gitwand can help process complex merge conflicts, but the material does not say it resolves them automatically. Complex hunks remain pending and can be explained, proposed through the connected agent, or handled with a custom or LLM-provided resolution.

It mentions MCP sessions, Claude Code, Codex, and a VS Code extension in the broader GitWand project, but gives no Cursor configuration or compatibility statement.

Related MCP servers

All in Version Control All alternatives
Add a badge to your READMEShow it’s listed — live SVG, Markdown or HTML.

AllMCPs Directory Badge

Full Badge Customizer

Showcase your server listing on GitHub or your project documentation. Embed this dynamic SVG badge to highlight official listing status and live engagement.

Badge Style:
Live Dynamic SVG PreviewGitwand AllMCPs Directory Badge
Markdown (GitHub README)
[![AllMCPs](https://allmcps.com/api/badge/gitwand?style=directory)](https://allmcps.com/mcp/gitwand)
HTML Embed
<a href="https://allmcps.com/mcp/gitwand"><img src="https://allmcps.com/api/badge/gitwand?style=directory" alt="Gitwand on AllMCPs" /></a>