Can I cancel the process if things go wrong?

Yes, you can request to abort at any time. The skill will then execute the appropriate 'git merge --abort' or 'git rebase --abort' command to return your repo to its previous state.

Does it support manual code merging?

Absolutely. Beyond simple 'ours' or 'theirs' choices, the skill can use Claude's editing capabilities to intelligently combine logic from both branches while maintaining code integrity.

Will it accidentally leave conflict markers in my code?

No, the workflow includes a validation step that ensures all markers ( >>>) are removed and the file is properly staged before moving to the next conflict.

Can I use this for both merges and rebases?

Yes, the skill automatically detects if a merge or rebase is in progress and adapts its commands and finalization steps (commit vs. continue) accordingly.

Interactive Git Conflict Resolver

Name: Interactive Git Conflict Resolver
Author: atournayre

byatournayre

•

Developer Tools

Resolves Git merge and rebase conflicts through an interactive, step-by-step guided workflow with validation.

The Interactive Git Conflict Resolver is a specialized tool for Claude Code designed to simplify the complex process of fixing Git conflicts. It automatically detects whether you are in a merge or rebase state, identifies all conflicted files, and guides you through each one with clear context. For every conflict, it offers three distinct strategies: keeping your local version, accepting the incoming version, or performing an intelligent manual merge using Claude's reasoning. By validating every step and ensuring no conflict markers remain, it helps developers maintain repository integrity and significantly reduces the cognitive load of synchronizing divergent branches.

Key Features

01Automated detection of merge/rebase status and conflicted files

028 GitHub stars

03Automatic finalization of the Git operation upon successful resolution

04Three-way resolution strategies: Ours, Theirs, or Intelligent Manual Merge

05Step-by-step validation to ensure files are correctly staged and markers removed

06Real-time diff visualization and context analysis for each conflict

Use Cases

01Safely merging divergent logic where changes from both branches must be preserved

02Resolving complex multi-file conflicts after syncing a feature branch with main

03Managing difficult code integration during a Git rebase operation

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add atournayre/claude-marketplace conflit

For use in Claude.ai and ChatGPT

Download Skill