LocalFree

GitWand MCP server

devlint/GitWand

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

191 GitHub stars12 forks
Source code

Install GitWand in Claude Code

Claude Code
claude mcp add gitwand -- npx -y @gitwand/mcp
mcp.json (Claude Desktop, Cursor, VS Code, Windsurf)
{
  "mcpServers": {
    "gitwand": {
      "command": "npx",
      "args": [
        "-y",
        "@gitwand/mcp"
      ]
    }
  }
}

Frequently asked questions

What does the GitWand MCP server do?

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

Is the GitWand MCP server free?

Yes, most likely. Open source and no paid account or API key is mentioned in the listing. Check the provider for current pricing.

Does GitWand run locally or remotely?

Local. Runs on your machine (stdio). You install it with npx, uvx, Docker or from source.

How do I add GitWand to Claude Code?

Run: claude mcp add gitwand -- npx -y @gitwand/mcp

More version control MCP servers

View all

GitHub

34k

github/github-mcp-server

GitHub integration for repository management, pull requests, issues and more.

Local + RemoteAccount neededTypeScript

GitDiagram

19k

ahmedkhaleel2004/gitdiagram

Architecture diagrams, explanations and Mermaid source for public GitHub repositories.

RemoteAccount needed

GitLab

2.1k

zereight/gitlab-mcp

GitLab MCP server for projects, merge requests, issues, pipelines, wiki, releases, and more.

LocalFree

OpenOSINT

1.8k

OpenOSINT/OpenOSINT

AI-powered OSINT agent & MCP server. 21 tools: email, breach, IP, WHOIS, DNS, Shodan, GitHub & more.

LocalAccount needed

SoloMD

1.5k

zhitongblog/solomd

Read and search a folder of Markdown notes: search, backlinks, tags, tasks, outlines, git history.

LocalFree

Best of Agent Harnesses

1.4k

RyanAlberts/best-of-Agent-Harnesses

Agent-harness picks, decision guides, setup templates, and skills; live GitHub/HN discovery.

LocalFree