Merge Conflict Resolver

Systematic Git Conflict Resolution

Merge conflicts are the bane of automated workflows. This skill provides your AI agent with a rigorous, step-by-step framework to resolve conflicts across any programming language—from simple content overlaps to complex rename/delete scenarios and binary file collisions.

What it does

Instead of the "blind guessing" typical of standard LLM prompts, this skill guides the agent through an 9-step professional workflow:

• Scope Assessment: Quantifies conflicts and identifies their types (add/add, modify/delete, etc.).
• Contextual Analysis: Understands the developer's intent (feature vs. bug fix vs. refactor) before touching code.
• Strategy Selection: Automatically chooses between "Accept Ours," "Accept Theirs," or "Manual Merge" based on objective criteria.
• Language-Specific Verification: Includes specialized checks for Python (indentation), JS/TS (duplicate imports), Go (struct formatting), and SQL (foreign key consistency).
• Final Validation: Runs greps for leftover markers and executes build/test commands to ensure the fix actually works.

Why use this skill?

Prompting an AI to "fix these conflicts" often leads to truncated files, deleted logic, or broken syntax. This skill enforces a structured logic that mirrors how senior engineers handle complex merges, ensuring zero data loss and maintaining a clean, linear git history.