Make /rebase risk-based: auto-proceed on no overlap, menus otherwise#9
Open
gering wants to merge 1 commit into
Open
Make /rebase risk-based: auto-proceed on no overlap, menus otherwise#9gering wants to merge 1 commit into
gering wants to merge 1 commit into
Conversation
- Step 5: compute file overlap between base and branch since merge-base; zero overlap -> rebase + force-push immediately (invocation = authorization), overlap -> AskUserQuestion menu (rebase / show diff / leave as-is) - Steps 6+7: stash question and conflict options become selection menus instead of free-text [y/N] prompts - --auto unchanged for parent skills; auto-stash now refuses in --auto mode - README: force-push safety + design principles reflect the new model - Bump pr-flow to 1.2.2 (plugin.json + marketplace.json) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Owner
Author
|
@claude review |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
/rebaseno longer asks for confirmation when the rebase is risk-free: if the files changed on base and on the branch don't overlap since the merge-base, it rebases + force-pushes (--force-with-lease) immediately — invoking the skill is the authorizationy/n/dpromptChanges
skills/rebase/SKILL.md: step 5 rewritten (overlap check viacomm -12on bothgit diff --name-onlysides; safe path vs decision path), step 6 stash menu (refuses to stash silently in--auto), step 7 conflict menu, notes + description updatedREADME.md: force-push safety section + design principles ("Interactive by default, silent when risk-free")Readiness
scripts/check-structure.py: 0 errors (2 pre-existing warnings, none added)add-changelog)Test plan
/rebaseon a branch with zero file overlap vs base → proceeds without prompt, aborts cleanly on unexpected conflict/rebasewith overlapping files → AskUserQuestion menu appears with rebase/diff/leave options/cycleand/mergedelegation (--auto) unchanged🤖 Generated with Claude Code