Git Conflict

Provides an MCP server and WebUI to detect, read, and resolve Git merge conflicts interactively.

typescript

4

GitHub Stars

typescript

Language

6 months ago

First Indexed

2 months ago

Catalog Refreshed

Documentation & install

Readme and setup notes from the catalogue, plus a client-ready config you can copy for your MCP host.

Installation

Add the following to your MCP client configuration file.

Configuration

View docs

{
  "mcpServers": {
    "mattyatea-git-conflict-mcp": {
      "command": "npx",
      "args": [
        "-y",
        "git-conflict-mcp"
      ],
      "env": {
        "WEBUI_PORT": "3456"
      }
    }
  }
}

You run a dedicated MCP server to help AI agents and developers detect, read, and resolve Git merge conflicts, with a built-in WebUI for interactive, human-in-the-loop resolution. This server streamlines conflict management and keeps changes intentional and auditable.

How to use

You use this server by starting it through your MCP client, then interact with the WebUI to review conflicting blocks, read the surrounding context, and apply resolutions. The WebUI provides syntax highlighting, a clear diff view, and an editable browser surface so you can directly modify conflicts and save changes back to your repository.

How to install

Prerequisites you need before installation:

Node.js installed on your machine (Node 12+ is typically fine). - npm or npx available from your Node installation.

Then run the MCP server locally with the standard npx command.

Install and start the server with the following commands:

npx -y git-conflict-mcp

Configuration and usage notes

The server exposes a WebUI by default at http://localhost:3456. If you want to run the WebUI on a different port, you can set the WEBUI_PORT environment variable when starting the server.

Additional notes

Configuration examples in this guide show how to wire the MCP server into client tools. The server can be started directly with an MCP command, or integrated into your development tooling using the provided CLI helpers.

If you are integrating with other tools, you can specify the WebUI port via the WEBUI_PORT environment variable to avoid collisions with other services.

Available tools

detect_conflicts

Detects git merge conflicts within the repository to identify where human intervention is required.

read_conflicts

Reads and analyzes conflicting blocks to present context and implications of each resolution.

resolve_conflicts

Assists in proposing or applying resolutions to merge conflicts, including diff-aware edits.

webui_editor

Provides an in-browser editor to modify conflicting files and preview changes in real time.

diff_view

Shows intelligent diffs to clearly display changes between conflicting versions.