Is it safe to use on production code?

Yes, it employs a mandatory grep verification step that prevents files from being staged until it is confirmed that zero conflict markers remain in the code.

Does this skill support git rerere?

Yes, the skill is designed to work with git rerere, allowing Git to remember and automatically apply your conflict resolutions in future similar scenarios.

Can I choose to keep incoming changes instead of HEAD?

While the skill defaults to keeping HEAD, the subagent instructions can be modified or the operator can specify a preference for incoming changes during the resolution process.

Does it automatically complete the rebase?

After all individual file conflicts are verified as resolved and staged, the skill will execute 'git rebase --continue' to move the process forward.

How does it handle large files with conflicts?

For whole-file conflicts, it uses an optimized 'git show' method that consumes zero tokens. For partial conflicts, it delegates tasks to subagents to manage context window limits efficiently.

Rebase Conflict Resolver

Name: Rebase Conflict Resolver
Author: full-stack-biz

byfull-stack-biz

•

Developer Tools

Resolves git rebase and merge conflicts systematically using block-by-block verification and subagent delegation.

The Rebase Conflict Resolver is a specialized Claude Code skill designed to handle complex Git rebase and merge conflicts with surgical precision. Instead of risky bulk operations, it processes conflicts one block at a time, performing mandatory verification using grep to ensure no markers are left behind. It optimizes token usage by delegating individual file resolutions to subagents and utilizes a high-performance 'whole-file' resolution strategy for files that need to be completely reset to the HEAD version. By integrating with git rerere, it also helps the system learn from previous resolutions, making it an essential tool for maintaining clean commit histories in large or active repositories.

Key Features

01Block-by-block conflict resolution to prevent accidental data loss during complex merges.

02Optimized 'whole-file' resolution using git show for maximum speed and zero token cost.

03Automated verification using grep to ensure all conflict markers are removed before staging.

04Native support for git rerere to leverage and record previous conflict resolution patterns.

051 GitHub stars

06Subagent delegation for parallel, token-efficient processing of multiple conflicted files.

Use Cases

01Automating the 'continue' phase of a difficult git rebase involving dozens of files.

02Systematic cleanup of conflict markers while strictly adhering to a 'keep HEAD' versioning policy.

03Resolving complex merge conflicts after a long-lived feature branch is integrated.

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add full-stack-biz/claude-dev-flow rebase-resolver

For use in Claude.ai and ChatGPT

Download Skill