Gitwand MCP server

Read from the package source without running it. The installed server may list more.

• gitwand_apply_resolution

  Apply a custom resolution (provided by the LLM or user) to a specific conflict hunk. Replaces the conflict markers at the given line range with the provided content. Use this for 'complex' hunks that GitWand couldn't auto-resolve.

• gitwand_explain_hunk

  Explain why a specific conflict hunk was classified as its type. Returns the DecisionTrace with each evaluation step and the ours/theirs/base content for context.

• gitwand_preview_merge

  Side-effect-free Conflict Predictor. Simulates a merge, rebase, or cherry-pick and reports how many conflicts GitWand can auto-resolve vs. how many need manual/LLM attention, plus an overall risk level (low/medium/high). Does NOT modify the working tree, index, or HEAD. - operation 'merge' (default): analyzes conflicts already materialized in the working tree (files with conflict markers). - opera

• gitwand_resolve_conflicts

  Auto-resolve trivial Git merge conflicts using GitWand's pattern-based engine. Returns resolved files, DecisionTrace for each hunk, and pendingHunks for conflicts that need human/LLM review. Writes resolved files to disk unless dry_run is true.

• gitwand_resolve_hunk

  Ask the connected AI agent (the caller of this MCP server) to propose a resolution for a single Git merge conflict hunk.

• gitwand_resolve_hunk_llm

  Validate and apply an LLM-proposed resolution for a specific conflict hunk.

• gitwand_status

  List conflicted files in the current Git repo with their complexity and auto-resolvability. Returns a structured JSON report with conflict counts, types, and confidence scores.

• Code scan13 source files scanned25/25
• –Live reliabilityno gateway calls yet and no remote to proben/a
• –Tool poisoningtools not inspected (local package is not executed); not countedn/a
• Auth qualitylocal package, no credentials required12/15
• Maintenancelast push 1 days ago15/15
• Maintainer identityregistry namespace matches repository owner; GitHub account older than a year8/10

Gitwand: common questions

Is Gitwand MCP server safe?

Yes, by our scan: it is graded A (92/100). Read the Gitwand safety report

How do I install Gitwand?

It runs on your machine. Copy the Claude Code, Claude Desktop or Cursor config from the install section.

Does Gitwand need an API key?

Not as far as the registry entry and our scan can tell: no credentials are declared or required.

Is Gitwand maintained?

The last commit was in the last day (2026-09-18). The latest release is v3.10.1.

What can I use instead of Gitwand?

Servers from other publishers that do the same job: Gitlab MCP server, Srclight MCP server and Contentrain MCP server. Compare all Gitwand alternatives.