rebasing-branch

Rebasing integrates your branch's commits onto an updated base branch, rewriting history to create a linear timeline. This Skill automates the process: it syncs your base branch with remote, applies your commits on top, and guides you through conflict resolution so your feature branch stays current without merge commits.

Rebasing replays your commits on top of the target base, rewriting their history. Each commit is reapplied in order; if conflicts arise, you resolve them per commit before the rebase continues. Your working directory is preserved, and you can optionally maintain or reset commit author dates.

No. This Skill enforces a clean working tree before rebasing to prevent data loss. Commit or stash your changes first, then initiate the rebase. The Skill validates your environment as a safety check before any history rewriting begins.

When conflicts occur, the rebase pauses and this Skill provides structured guidance for each conflicted file. You edit files to resolve conflicts, stage them, and the workflow resumes, replaying remaining commits. No manual git commands are required.

Rebasing rewrites history by replaying commits linearly; merging creates a merge commit that preserves both branches. Rebasing produces cleaner, linear history ideal for feature branches; merging is safer for shared branches. This Skill implements rebase workflows for mainline integration.

No. This Skill detects and prevents rebasing mainline branches to protect shared history. It identifies branches you shouldn't rebase and enforces this safety check before any operation begins.