Merge Conflict Parser

Example Use Cases

• 1

  Programmatically analyze and extract detailed information from git merge conflicts.

• 2

  Automate conflict resolution workflows by understanding conflict context and content.

• 3

  Integrate conflict parsing into larger code review or CI/CD pipelines.

Description

This MCP server reads files containing git merge conflict markers and produces structured JSON output that includes each conflict's content, line numbers, branch references, and surrounding context. It supports both standard and diff3 conflict styles, making it easier to analyze and resolve merge conflicts programmatically. The tool can be used via CLI or integrated as an MCP server in Claude configurations.