gpsaggese/helpers / .claude/skills/git.rebase
git.rebase
VerifiedRebase the current branch on master and resolve the conflicts
Goal
- Rebase the current branch on
masterwithi git_rebase_master, resolve every conflict, and rungit rebase --continueuntil the rebase finishes
Workflow
Check the Starting State
- Confirm no rebase is already in progress:
> ls -a .git | grep -E "rebase-merge|rebase-apply"- If a rebase is in progress, skip to
## Resolve the Conflicts
- If a rebase is in progress, skip to
- Confirm the current branch is not
master:> git branch --show-current
Start the Rebase
- Run the invoke task:
> i git_rebase_master - If the task finishes without conflicts, go to
# Verification - If the task stops with conflicts, go to
## Resolve the Conflicts - If the task does not exist or fails for another reason, stop and report the error to the user
Resolve the Conflicts
- List the files with conflicts:
> git diff --name-only --diff-filter=U
Ignore the helpers_root Conflict
helpers_rootis a submodule, so Git reports a conflict on its pointer- Do not resolve it, do not update the submodule, and keep it as it is in the
working tree:
> git add helpers_root - Do this only for the path
helpers_root, never for files inside it
Resolve the Other Conflicts
- For every other file with conflicts, follow
.claude/skills/git.merge_conflicts/SKILL.md- The operation in progress is a
rebase - Skip its step
## Finalize the Operation: this skill runsgit rebase --continuebelow - Keep its rule to ask the user when a conflict is ambiguous
- The operation in progress is a
- Note: in a rebase,
<SOURCE>is the branch being replayed (the user's commits) and<TARGET>ismaster
Continue the Rebase
- Once no file has conflicts, continue without opening an editor:
> GIT_EDITOR=true git rebase --continue - Calling this skill is the user's permission to run
git rebase --continue - If Git stops again on the next commit with new conflicts, go back to
## Resolve the Conflicts - Repeat until
git statusreports that no rebase is in progress
Constraints
- Do not run
git rebase --abortorgit rebase --skipunless the user asks - Do not skip hooks (e.g.,
--no-verify) - Do not push: a rebase rewrites history, so tell the user that the next push
needs
--force-with-lease - Do not commit anything other than what
git rebase --continuecreates
Verification
- No rebase is in progress:
> ls -a .git | grep -E "rebase-merge|rebase-apply" - No conflict markers remain:
> git grep -n '^<<<<<<<\|^>>>>>>>' - The working tree is clean, apart from files that were not clean before the
rebase:
> git status - The branch contains the tip of
master:> git log --oneline -1 master > git merge-base --is-ancestor master HEAD && echo OK
Related skills
| Skill | Stars | Updated | Works with | Status | Install |
|---|---|---|---|---|---|
| receiving-code-reviewobra/superpowersUse when receiving code review feedback, before implementing suggestions, especially if feedback seems unclear or technically questionable - requires technical rigor and verification, not performative agreement or blind implementation | Stars: 319k | Updated | Claude CodeCodex | Verified | Install |
| requesting-code-reviewobra/superpowersUse when completing tasks, implementing major features, or before merging to verify work meets requirements | Stars: 319k | Updated | Claude CodeCodex | Verified | Install |
| using-git-worktreesobra/superpowersUse when starting feature work that needs isolation from current workspace or before executing implementation plans - ensures an isolated workspace exists via native tools or git worktree fallback | Stars: 319k | Updated | Claude CodeCodex | Verified | Install |
| verification-before-completionobra/superpowersUse when about to claim work is complete, fixed, or passing, before committing or creating PRs - requires running verification commands and confirming output before making any success claims; evidence before assertions always | Stars: 319k | Updated | Claude CodeCodex | Verified | Install |