io.github.devlint/gitwanddev-tools

gitwand

Verified · today

Auto-resolves Git merge conflicts so agents only touch the complex hunks.

Install

claude mcp add gitwand -- npx -y @gitwand/[email protected]

Our take

GitWand exposes its deterministic merge-conflict resolver as an MCP server, returning classifications, confidence, traces, and pending hunks that an agent can act on. It is a focused companion to the desktop/CLI Git client rather than a general Git automation server. There is one default-branch self-insertion in a forked awesome-tauri list, which is a distribution caveat under current precedent, not a flag by itself.

reviewed by hand · 2026-07-06

Something wrong or dead here? Report it

Verification record

last verified: today
github stars: 108
last commit: 2 days ago
archived: no
license: MIT
npm: @gitwand/mcp
latest version: 3.2.0
in registry since: 2026-07-02

github.com/devlint/GitWand