1

    merge-conflict-resolver

    by Zicheng Liao

    A professional systematic framework for AI agents to analyze, resolve, and verify complex git merge conflicts.

    Updated Jun 2026
    0 installs

    Free

    Included in download

    • Downloadable skill package
    • 1 permission declared
    • Instant install

    See it in action

    A real example of what this skill takes in and produces.

    Sample output

    CONFLICT (content): Merge conflict in api/client.ts Resolution: Integrated both local timeout changes and incoming retry logic. Check: No markers found. Verification: 'npm run build' successful. Result: Merged lines 42-56 to include both logic paths without duplicating imports.

    About This Skill

    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.

    Use Cases

    • Resolve overlapping logic changes in shared files across any language
    • Handle complex rename/delete and add/add conflict scenarios systematically
    • Verify merge resolutions by running builds and checking for leftover markers
    • Maintain repository integrity during automated rebase or integration workflows
    • Manage dependency version conflicts in package.json or go.mod files

    Reviews

    No reviews yet - be the first to share your experience.

    Only users who have downloaded or purchased this skill can leave a review.

    Security Scanned

    Passed automated security review

    Permissions

    Terminal / Shell

    File Scopes

    merge-conflict-resolver/**

    Tags

    git
    merging
    devops
    version-control
    workflow

    Creator

    Zicheng Liao

    Frequently Asked Questions

    Learn More About AI Agent Skills

    More Premium Skills

    software-architect

    A structured framework for planning, reviewing, and evolving complex software systems with explicit trade-offs.

    $52 installs

    designing-hybrid-context-layers

    Architects the right retrieval strategy for every query — teaching your agent when to use RAG, a knowledge graph, or a temporal index instead of defaulting to vector search for everything.

    $1012 installs

    consumer-motivation-analyzer

    Go beyond surface-level feedback to uncover the psychological drivers and hidden motivations behind buyer behavior.

    $199 installs

    keyword-research

    Transform URLs or product lists into SEO keyword research packs with Google Ads data and intent-based clustering.

    $77 installs

    Free