Stats
Actions
Tags
Help us improve
Share bugs, ideas, or general feedback.
From caspar
👻 | Safe guided git rebase — backup ref, auto-resolve conflicts, verify tests, smoketest guide. Use to rebase the current branch onto a target (e.g. origin/main), especially when conflicts or post-rebase verification are expected. Do NOT use for merges, cherry-picks, interactive history edits, or non-git work.
npx claudepluginhub codename-inc/caspar --plugin casparHow this skill is triggered — by the user, by Claude, or both
Slash command
/caspar:caspar-rebaseThe summary Claude sees in its skill listing — used to decide when to auto-load this skill
Rebase the current branch onto a target, resolving conflicts and verifying the result, with a recoverable safety net.
Guides technical evaluation of code review feedback: read fully, restate for understanding, verify against codebase, respond with reasoning or pushback before implementing.
Share bugs, ideas, or general feedback.
Rebase the current branch onto a target, resolving conflicts and verifying the result, with a recoverable safety net.
$ARGUMENTS (e.g. origin/main). If absent, ask which branch to rebase onto.git status, never assume).npm test, pytest, cargo test, go test).A rebased branch and a Rebase Summary returned in-thread (not written to disk):
{current} → {target}; commit count; conflict count; test result PASS/FAIL.| File | Decision | Rationale |.{area}: [ ] {behavior to verify}.DONE when: rebase completes with no remaining conflict markers, commit count validated against expectation, lint + full test suite actually run and passing, and the summary (including the backup ref + restore command) is delivered.
git commit -am "chore: snapshot before rebase") — no prompt. Then git fetch origin.git branch backup/rebase-$(date +%Y%m%d-%H%M%S) → restore via git reset --hard {backup}. This is the only rollback; never start the rebase without it.git rebase {target}. For each conflict: resolve favoring the target branch's conventions (no prompts), record {file}: {decision} — {rationale}, git add, git rebase --continue. Repeat until clean.Return the Rebase Summary inline as a compressed (1–2K) block. End with a one-line Next Steps pointer to the appropriate next phase (e.g. evaluate / ship).