Git Branch Rebasing

소개

The rebasing-branch skill provides a robust, multi-phase workflow for updating feature branches with the latest changes from a target branch. It eliminates common Git errors by implementing a 'Git Safety Protocol' that includes pre-flight checks to prevent rebasing the mainline branch, automated syncing of the base branch with remote updates, and state preservation for uncommitted changes. Whether you are updating a feature branch against 'main' or performing a complex 'rebase onto' operation, this skill provides structured conflict resolution guidance and verification steps to ensure a clean commit history.

주요 기능

• Mainline protection prevents accidental rebasing of stable branches
• Optional author date resetting to maintain chronological history
• Pre-rebase working tree validation and auto-commit integration
• Automated base branch checkout and remote synchronization
• Guided conflict resolution with step-by-step recovery instructions
• 1 GitHub stars

사용 사례

• Rebasing a series of experimental commits onto a specific development target
• Updating a stale feature branch with the latest changes from the main branch
• Cleaning up and linearizing commit history before submitting a pull request