git-rebase-conflict-resolver

What problem does it solve?

This Skill helps developers safely rebase Git branches while resolving conflicts without losing compatible changes from either side, reducing the risk of broken history rewrites.

Core Features & Use Cases

• Conflict-Preserving Rebases: Guides branch rebases onto a target branch while analyzing both local commits and target changes to produce compatible merges.
• Validation Workflow: Ensures the rebased result is checked with repository-specific linting, formatting, and test commands before completion.
• Use Case: When a feature branch has fallen behind origin/main and contains conflicting changes, use this Skill to complete the rebase, resolve conflicts carefully, and verify the final branch state.

Quick Start

Use the git-rebase-conflict-resolver skill to rebase my current branch onto origin/main, resolve any conflicts, and run the appropriate validation checks.