Armory
Source
Browse
MCPs

mcp-gitwand

an MCP server that auto-resolves Git merge conflicts so agents only touch the complex hunks — deterministic pattern engine with confidence scores and a full decision trace, plus merge/rebase preview and hunk-level resolution tools

Score
89.9642 signals
Evidence
167 stars · 7 forks
Last commit
as last read from GitHub; most reads are from 2 Sep 2026 or later
Listed

Install

No one-command install. Set it up from its source.

Alternatives · MCPs

  1. recommend-agentic-trust-layer22 stars · 5 forks77.366
  2. simple-merge-review-mcp4 stars · 1 fork49.118
  3. mattyatea-git-conflict5 stars46.654

What it is

an MCP server that auto-resolves Git merge conflicts so agents only touch the complex hunks — deterministic pattern engine with confidence scores and a full decision trace, plus merge/rebase preview and hunk-level resolution tools

When to use it

an MCP server that auto-resolves Git merge conflicts so agents only touch the complex hunks — deterministic pattern engine with confidence scores and a full decision trace, plus merge/rebase preview and hunk-level resolution tools

How to install / invoke

See Glama for the install config.

Notes

Listed from the Glama MCP registry.