Does it simply pick one side of the conflict markers?

No, the sub-agent analyzes the intent of both code changes and attempts to merge the logic so that functionality from both branches is preserved.

What happens if the AI cannot resolve a conflict?

The skill will output 'ESCALATE', log the specific reason in your project tracking, and abort the merge to keep the branch clean.

Can I use this for both merging and rebasing?

Yes, the skill is designed to handle conflicts triggered by 'git merge main' or 'git rebase main' workflows.

Does it verify the code after merging?

Yes, it runs verification gates such as linting and unit tests. If these fail, the resolution is not committed.

How does this skill handle complex conflicts?

For conflicts exceeding 50 lines or involving major structural changes, the skill logs an escalation to progress.txt and reverts the merge to ensure safety.

Git Conflict Resolver

Name: Git Conflict Resolver
Author: kimhons

bykimhons

•

开发者工具

Automatically resolves Git merge and rebase conflicts by semantically analyzing and merging code logic.

The Git Conflict Resolver skill empowers Claude to autonomously navigate complex version control merges by delegating conflicts to a specialized sub-agent. By analyzing the semantic intent of changes on both sides of a conflict, it goes beyond simple line-by-line matching to intelligently integrate logic. The skill manages the entire lifecycle of a conflict, from initial detection and sub-agent invocation to post-resolution verification via linting and tests, ensuring that only valid, functional code is committed back to the repository.

主要功能

01Comprehensive logging of merge status and blocked stories

02Semantic intent analysis for intelligent code merging

03Smart escalation threshold for complex structural changes

041 GitHub stars

05Automated verification through integrated linting and test gates

06Autonomous sub-agent delegation for multi-file conflict resolution

使用场景

01Automated pre-flight merge checks during autonomous development loops

02Handling routine code integration conflicts without manual developer intervention

03Resolving conflicts when syncing a long-running feature branch with main

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add kimhons/ralph-loop-ultra git-conflict-resolver

For use in Claude.ai and ChatGPT

Download Skill