Is it safe to use on production-critical branches?

Yes, the skill is 100% interactive. It requires user confirmation for every single action and offers the ability to abort the process at any time.

Can I manually edit the code during resolution?

Absolutely. The skill offers a 'Manual Resolution' option that allows you to use the Edit tool to combine changes and remove conflict markers precisely.

Does this skill support both merge and rebase?

Yes, the skill automatically detects whether you are performing a merge or a rebase and provides the appropriate commands like 'git rebase --continue' or 'git commit' accordingly.

How does it handle multiple conflicted files?

It queues all conflicted files and walks you through them one by one, ensuring each is staged and validated before moving to the next.

Git Conflict Resolver

Name: Git Conflict Resolver
Author: atournayre

byatournayre

0•

Herramientas para Desarrolladores

Facilitates interactive Git conflict resolution through step-by-step analysis, strategy suggestions, and automated validation.

The Git Conflict Resolver skill streamlines the often-frustrating process of merging and rebasing by providing a guided, interactive workflow within Claude Code. It automatically detects merge or rebase conflicts, analyzes the affected files, and presents clear options for resolution—including 'ours', 'theirs', or manual editing. With built-in validation at every step and a final reporting mechanism, it ensures that conflicts are resolved correctly without leaving behind stray markers or broken code, making it an essential tool for developers managing complex branches and frequent integrations.

Características Principales

010 GitHub stars

02Detailed final report summarizing all resolutions applied

03Real-time validation to ensure no conflict markers remain

04Step-by-step interactive resolution for every conflicted file

05Automated detection of merge and rebase states

06Intelligent strategy suggestions (Ours vs. Theirs vs. Manual)

Casos de Uso

01Safely rebasing a local branch onto a fast-moving upstream main branch

02Resolving complex merge conflicts after a long-lived feature branch

03Standardizing conflict resolution patterns for junior developers

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add atournayre/claude-personas conflict

For use in Claude.ai and ChatGPT

Características Principales

010 GitHub stars

02Detailed final report summarizing all resolutions applied

03Real-time validation to ensure no conflict markers remain

04Step-by-step interactive resolution for every conflicted file

05Automated detection of merge and rebase states

06Intelligent strategy suggestions (Ours vs. Theirs vs. Manual)

Casos de Uso

01Safely rebasing a local branch onto a fast-moving upstream main branch

02Resolving complex merge conflicts after a long-lived feature branch

03Standardizing conflict resolution patterns for junior developers

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add atournayre/claude-personas conflict

For use in Claude.ai and ChatGPT