Can this skill handle multiple conflicting files at once?

Yes, it processes conflicts one file at a time, staging resolved files with git add, and continuing the rebase or merge operation only once the workspace is clean.

What happens if a merge or rebase becomes too messy to resolve?

The skill includes safety protocols to abort the current git operation (rebase --abort or merge --abort) if a clean resolution cannot be guaranteed, preventing repository corruption.

How does Claude decide which version to keep in a conflict?

Claude analyzes the intent of both changes by reviewing the file history and issue references, determining if the changes are mutually exclusive or if a manual hybrid merge is required.

Does it check for errors after resolving the conflict?

Yes, it performs a mandatory verification step that includes type checking (e.g., npm run typecheck) and running relevant unit tests to ensure no regressions were introduced.

Conflict Resolution

Name: Conflict Resolution
Author: troykelly

bytroykelly

開発者ツール

Manages and resolves git merge conflicts systematically to maintain code integrity during rebases and merges.

概要

The Conflict Resolution skill provides Claude with a structured methodology for handling complex code collisions during git operations like rebasing, merging, and cherry-picking. It guides the AI through a multi-step process of understanding the conflict history, analyzing the intent behind opposing changes, implementing intelligent manual or automated resolutions, and verifying the results through syntax checks and unit tests. This ensures that features are integrated cleanly without losing critical logic or introducing semantic bugs that typical auto-mergers might miss.

主な機能

Systematic five-step resolution process: Understand, Analyze, Resolve, Verify, Continue
Automated syntax and type checking post-resolution
Detailed resolution summaries for pull request documentation
Intelligent intent analysis to decide between 'ours', 'theirs', or manual merging
Comprehensive verification including unit test execution and visual diff reviews
0 GitHub stars

ユースケース

Resolving complex conflicts when rebasing long-lived feature branches onto main
Merging upstream changes while preserving specific local feature logic
Identifying and fixing 'semantic conflicts' where code merges but logic breaks

概要

主な機能

Systematic five-step resolution process: Understand, Analyze, Resolve, Verify, Continue
Automated syntax and type checking post-resolution
Detailed resolution summaries for pull request documentation
Intelligent intent analysis to decide between 'ours', 'theirs', or manual merging
Comprehensive verification including unit test execution and visual diff reviews
0 GitHub stars

ユースケース

Resolving complex conflicts when rebasing long-lived feature branches onto main
Merging upstream changes while preserving specific local feature logic
Identifying and fixing 'semantic conflicts' where code merges but logic breaks