Conflicts is a specialized tool designed to simplify the complex task of handling Git merge conflicts. It meticulously reads files containing standard and diff3 conflict markers, transforming raw conflict data into easily consumable structured JSON. This output includes crucial details such as the 'ours' and 'theirs' versions of conflicted code, their respective line numbers, associated branch references, and surrounding contextual lines, making it an invaluable asset for developers seeking to programmatically analyze and resolve merge issues.
Key Features
01Supports both command-line interface (CLI) and MCP server modes
02Generates structured JSON output for merge conflicts
03Provides configurable surrounding contextual lines for each conflict
04Parses both standard and diff3 Git conflict styles
05Extracts ours/theirs content, line numbers, and branch references
060 GitHub stars
Use Cases
01Enhancing conflict resolution workflows with structured data for AI assistance
02Automated analysis of Git merge conflicts in CI/CD pipelines
03Integrating conflict data into custom developer tools or scripts
