rebase
Installation
SKILL.md
Rebase a branch onto a new base
Git can replay commits. It cannot tell you whether the replayed solution still makes sense on a codebase that moved on. This skill re-validates the work against the new base, then does the mechanics carefully.
Do not invoke it for a fast-forward with no semantic delta. That is just git rebase.
Required references
Paths are relative to this file. <plugin root> is two directories above it.
| File | Read at | Holds |
|---|---|---|
references/stash.md |
step 0, only if the tree is dirty | the labeled stash, the restore, a conflicted pop |
../../assets/writing.md |
step 7, before writing the plan | the writing rules for every text a person reads |
references/rationalizations.md |
when tempted to skip a step | why each shortcut fails |