Conflicts

Verified Integration

Author: @detailing•Category: ServerApplication

GitHub Repository

JSON-RPC 2.0

Protocol Standard

Sub-second

Execution Latency

Active

Operational Status

Client Configuration

— Connect Conflicts to Claude Desktop or Cursor in seconds

{
  "mcpServers": {
    "conflicts": {
      "command": "npx",
      "args": [
        "-y",
        "@modelcontextprotocol/server-conflicts"
      ],
      "env": {}
    }
  }
}

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

Architecture & Capabilities

System Overview

Parses files containing Git merge conflict markers to generate structured JSON output.

Indexed Date

7/22/2026

License

Open Source

Protocol Layer

stdio / SSE RPC

Frequently Asked Questions

Architecture and operational details for Conflicts

Yes, Conflicts allows you to specify the number of surrounding contextual lines (above and below each conflict) to be included in the JSON output. This is controlled via the `context_lines` parameter in both CLI and server modes, with a default of 1 line.

Related MCP Servers

Browse all servers →

@configuring

0xArchive

Provides comprehensive historical and real-time crypto market data, including orderbooks, trades, candles, and more, from Hyperliquid, HIP-3, and Lighter.xyz.

MCP Server5 FAQs

Learn more

@spawning

0xGasless

Facilitates gasless blockchain transactions and interactions directly from Claude AI conversations.

MCP Server4 FAQs

Learn more

@spawning

0xGasless

Bridges Claude AI with blockchain networks, enabling gasless transactions, swaps, and transfers directly from natural language conversations.

MCP Server5 FAQs

Learn more