Rebase feat with main
drawing UI consistently with agents, at the top of Design System + Component Library
npx -y skills add retz8/pastiche --skill rebase-feat-with-mainAssembled from the repository path, not quoted from the project. Check it against their README if it does not work.
One thing to look at
- 4 stars4 stars. Stars are a popularity signal and not a quality one, but at this level it is likely that nobody has read this closely except its author, and you would be relying on your own review.
What its author says it does
Copied from the file, not written here
Rebase the current pastiche feature branch onto main to absorb hotfixes. Use when the user invokes `/rebase-feat-with-main`, when resuming a task, or after a hotfix lands on main while a feature branch is in flight.
SKILL.md
0.8 KB, as published. Nobody here has run it
rebase-feat-with-main
Workflow
- Guard. Current branch must be a feature branch (
<version>/<task-name>) or sub-task branch — never main. Working tree must be clean; if not, stop and ask. git fetch origin maingit rebase origin/main- On conflict: stop immediately, show the conflicting files, and let the user decide — never auto-resolve, never
--abortwithout asking. - If the branch is already pushed:
git push --force-with-lease. Never force-push main. - Report: how many commits were replayed and whether main had moved at all (no-op is a valid outcome).