rebasing-branch

What problem does it solve?

This Skill simplifies the often complex and error-prone process of rebasing git branches. It guides you through updating your feature branch with the latest changes from mainline, handling conflicts, and preserving your work, ensuring a clean, linear project history without manual intervention.

Core Features & Use Cases

• Pre-flight Safety Checks: Prevents rebasing mainline and ensures a clean working tree before starting the operation.
• Automated Base Syncing: Automatically checks out and synchronizes the target base branch (e.g., main) before rebasing.
• Conflict Handling Guidance: Pauses the workflow to provide clear instructions for resolving merge conflicts, then resumes.
• Use Case: When your feature branch is falling behind main, simply ask to "rebase my branch onto main." This Skill will update your branch, resolve any conflicts with your guidance, and ensure a pristine commit history.

Quick Start

Rebase my current branch onto 'main'.