Fix Merge Conflict

Name: Fix Merge Conflict
Rating: 4 (3 reviews)
Author: yulonglin

MCP Server

by yulonglin · Added 5mo ago

Claude

Install

git clone https://github.com/yulonglin/dotfiles

Add to Claude

claude mcp add fix-merge-conflict

Quick Setup Config

Copy & paste ready

~/Library/Application Support/Claude/claude_desktop_config.json (macOS) %APPDATA%\Claude\claude_desktop_config.json (Windows)

{
  "mcpServers": {
    "fix-merge-conflict": {
      "command": "npx",
      "args": [
        "@modelcontextprotocol/fix-merge-conflict"
      ]
    }
  }
}

Paste into your Claude Desktop config file, then restart Claude.

About

Fix all merge conflicts on the current Git branch non-interactively and make the repo buildable and tested.

Fix Merge Conflict

Install

Add to Claude

Quick Setup Config

About

Tags

From Our Store

Claude Code Power User Kit

OpenClaw Business Starter Kit