git-conflict-mcp

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.

Features

• MCP Tools: Full suite of tools for agents to detect, read, and resolve git conflicts.

• Visual WebUI: A dedicated web interface (default: http://localhost:3456) for human-in-the-loop resolution.

  • Syntax Highlighting: Read code clearly with automatic language detection.

  • Diff View: See changes clearly with intelligent diff display.

  • Editable Interface: Directly edit conflicting files in the browser.

  • IDE Integration: One-click opening of files in your preferred editor (VSCode, WebStorm, Cursor, etc.).

• Smart Port Management: Automatically detects if the WebUI is already running and reuses the instance to avoid conflicts.

• Conflict Tracking: Keeps track of resolution status and rejection reasons.

Usage

via npx

You can run the server directly using npx. This requires no manual installation if you have Node.js installed.

The WebUI will start automatically. You can access it at: http://localhost:3456

MCP Configuration

Claude Desktop

You can add the server using the claude CLI:

Or manually edit claude_desktop_config.json:

Codex

You can add the server using the codex CLI:

JSON Type (Generic)

Development

To install dependencies:

To build (includes both Core and WebUI):

To run locally:

To run WebUI in development mode: