Gitwand

Name: Gitwand
Author: devlint

by devlintcommunityv2.14.0

118

GitWand is a native Git client that includes an MCP server and a CLI for resolving Git merge conflicts. It automatically handles trivial conflicts and provides structured conflict analysis, merge previews, and decision traces for ambiguous cases.

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

GitHub Repository

Install & configure

Install in your client

Paste into the AI you're chatting with — it will figure out the rest

Please install the `gitwand` MCP server into my current AI client (that's you).

Canonical MCP server config (stdio transport):
- command: `npx`
- args: ["-y","@gitwand/mcp"]

Note: Optional argument: add "--cwd", "<absolute-path-to-repo>" to args to pin the server to a specific repository instead of using the client's current working directory.

Add this MCP server to my current client's config in the correct format for you. If you need secrets or credentials I haven't provided, ASK me — do not invent values or leave raw placeholders. After adding it, tell me how to verify the server is connected.

Note: Optional argument: add "--cwd", "<absolute-path-to-repo>" to args to pin the server to a specific repository instead of using the client's current working directory.