Can I manually integrate code from both sides of a conflict?

Absolutely. The skill presents the code and allows you to choose specific integration patterns or define custom combinations to ensure no logic is lost.

What happens if I need to abort the resolution process?

The skill provides clear instructions and commands for aborting both rebase and merge processes to return your repository to its pre-conflict state.

How does it help prevent mistakes during resolution?

It ensures a clear visual display of the conflict markers and surrounding context before asking for a decision, forcing an informed choice rather than an accidental overwrite.

Does this skill support both rebase and merge?

Yes, it automatically identifies the current Git state and provides the appropriate commands and workflows for both rebase and merge operations.

Does it handle non-textual or binary file conflicts?

Yes, for binary files where line-by-line merging isn't possible, it helps you choose between the 'ours' or 'theirs' version to resolve the path.

Git Conflict Resolver

Name: Git Conflict Resolver
Author: MilesChou

byMilesChou

0•

Deployment & DevOps

Simplifies the process of identifying and resolving Git merge and rebase conflicts through a systematic, interactive workflow.

This skill provides a structured framework for managing Git conflicts that occur during rebase or merge operations. It automatically detects conflict states, identifies affected files, and guides the user through resolving differences by presenting clear comparisons between local and incoming changes. By offering specific resolution options—such as choosing 'ours', 'theirs', or performing manual integration—and handling finalization commands like 'git rebase --continue', it minimizes human error and reduces the friction of complex version control tasks.

Key Features

01Automatic detection of rebase and merge conflict states

02Interactive resolution options including 'Ours', 'Theirs', and manual integration

03Automated finalization of the rebase or merge workflow

040 GitHub stars

05Visual comparison of conflicting code blocks with detailed context

06Systematic tracking and listing of all unmerged files

Use Cases

01Safely integrating upstream changes while ensuring critical local logic is preserved

02Managing multiple file conflicts during a major team-wide merge

03Resolving complex code conflicts after a long-running feature branch rebase

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add mileschou/claude-marketplace resolving-conflict

For use in Claude.ai and ChatGPT

Download Skill