Git Conflict

Name: Git Conflict
Rating: 4 (9 reviews)
Author: ssiumha

MCP Server

by ssiumha · Added 5mo ago

Claude

Install

git clone https://github.com/ssiumha/dots

claude mcp add git-conflict

Copy & paste ready

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

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

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

Resolves Git conflicts (rebase, merge, cherry-pick, stash). Use when encountering merge conflicts during any Git operation.