Development
Skill
/rebase-feat-with-main
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.
Claude Code
$ npx -y skills add retz8/pastiche --skill rebase-feat-with-main --agent claude-code
Codex
$ npx skills add retz8/pastiche --skill rebase-feat-with-main -a codex -y
Cursor
$ npx skills add retz8/pastiche --skill rebase-feat-with-main -a cursor -y
Gemini CLI
$ npx skills add retz8/pastiche --skill rebase-feat-with-main -a gemini-cli -y
GitHub Copilot
$ npx skills add retz8/pastiche --skill rebase-feat-with-main -a github-copilot -y
OpenCode
$ npx skills add retz8/pastiche --skill rebase-feat-with-main -a opencode -y
Windsurf
$ npx skills add retz8/pastiche --skill rebase-feat-with-main -a windsurf -y
SKILL.md
rebase-feat-with-main.SKILL.mdname: rebase-feat-with-main description: 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.
rebase-feat-with-main
Workflow
1. **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. 2. `git fetch origin main` 3. `git rebase origin/main` 4. **On conflict:** stop immediately, show the conflicting files, and let the user decide — never auto-resolve, never `--abort` without asking. 5. **If the branch is already pushed:** `git push --force-with-lease`. Never force-push main. 6. Report: how many commits were replayed and whether main had moved at all (no-op is a valid outcome).
Stats
4
Stars
0
Forks
Maintained
Maintenance
TypeScript
Language
MIT
License
Last commit
Created
Ships withpastiche
Pastiche is a Claude Code plugin for Frontend UI implementation. Given a frontend task, it produces code that follows your established design system and component library — not by inventing, but by faithfully executing within the vocabulary your team already
412 skills3 agents
Stars on GitHub
Momentum
- stars in total
- 4
Other skills on pastiche.
More skills from other plugins.
Auto-invoked
brainstorming
You MUST use this before any creative work - creating features, building components, adding functionality, modifying behavior, or…
@obraInstall Skillask-matt
Ask which skill or flow fits your situation. A router over the skills in this repo.
@mattpocockInstall SkillAuto-invoked
Questions about rebase-feat-with-main.
- Which coding agents can use rebase-feat-with-main?
- rebase-feat-with-main installs in Claude Code, Codex, Cursor, Gemini CLI, GitHub Copilot, OpenCode and Windsurf with the skills CLI, using each agent's flag shown on this page. Flowy's auto-invocation, which fires a skill when your prompt matches, runs in Claude Code only.