mattyatea/git-conflict-mcp

5Stars on the repository
1Mods indexed here, across every type
8mo agoLast push, which is what freshness is scored on
AGPL-3.0Licence, which decides whether bodies are shown

git-conflict-mcp

01

mattyatea/git-conflict-mcp

MCP server Claude CodeCodexCursor +2

A powerful Model Context Protocol (MCP) server designed to help AI agents and developers resolve Git merge conflicts efficiently. It includes a built-in visual WebUI for interactive conflict resolution. Runs locally from the git-conflict-mcp npm package.

5 8mo ago A tokens not measured AGPL-3.0