rebase-conflict-resolution
CommunitySystematic git conflict resolution for large PRs.
Authorlgoodcode
Version1.0.0
Installs0
System Documentation
What problem does it solve?
Systematic workflow for rebasing or merging feature branches that overlap with recently merged PRs, enabling predictable conflict resolution and auditability across large codebases.
Core Features & Use Cases
- Conflict categorization (UU, DU/UD, etc.) and deterministic resolution strategies to minimize churn.
- Pre-rebase checklist and post-rebase verification to ensure integrated code passes checks.
- Audit trail and documentation guidance for cross-PR integrations and reviews.
Quick Start
Follow the pre-rebase checklist and apply the recommended conflict-resolution workflow to complete a clean merge.
Dependency Matrix
Required Modules
None requiredComponents
Standard package💻 Claude Code Installation
Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.
Please help me install this Skill: Name: rebase-conflict-resolution Download link: https://github.com/lgoodcode/instamolt-seeder/archive/main.zip#rebase-conflict-resolution Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
Agent Skills Search Helper
Install a tiny helper to your Agent, search and equip skill from 471,000+ vetted skills library on demand.