Skip to content

fix(rebase): resolve conflicts - #136

Merged
mmaclay merged 3 commits into
mainfrom
fix/rebase-leeway
Nov 13, 2026
Merged

mmaclay merged 3 commits into
mainfrom
fix/rebase-leeway

Conversation

@mmaclay

@mmaclay mmaclay commented Nov 12, 2026 •

Copy link
Copy Markdown
Member

mmaclay and others added 3 commits November 12, 2026 12:38
…n a yes

The rebase skill stopped at most conflicts, never dropped a commit the
target already held, and refused to push even when asked; pr-fix stopped
at every conflict and never used the rebase skill's rules (#114).

- rebase resolves any conflict whose answer both sides' commits show,
  regenerates lockfiles, and asks only where the sides want incompatible
  behavior.
- Commits the target holds in another form (a squash merge, an amended
  cherry-pick) are dropped, by --onto or a skip once empty, and named.
- Step 6 asks to push with the pinned-lease command, or prints it; a
  rule forbidding an agent's push still means print only.
- Only a rule that names a rebase or force-push makes "don't rebase"
  the recommendation, in rebase and pr-fix.
- pr-fix's two rebase points follow rebase's conflict rules.
- Sandbox: the rebase scenarios expect the push question, and
  rebase-drops-squashed-commits covers a squash-merged duplicate.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- pr-fix's "don't rebase" also counts a rule that names a force-push
  or rewriting published history, as rebase's step 1 does.
- Regenerating a lockfile is the one exception to running nothing that
  rewrites files mid-rebase.
- --onto drops only commits the target holds in full, and none when
  the person said to keep every commit.
- A push yes given at invocation is asked again when a resolved
  conflict went untested; Push is recommended with its reason.
- pr-fix step 13 lists each resolution and dropped commit; step 11
  recommends rerunning step 9 after a resolved conflict.
- Rename rebase-tracks-main-prints-push to
  rebase-tracks-main-pushes-own-name and restore its push guards.
- rebase-drops-squashed-commits fixes its fixture wording and checks
  the report names both dropped commits.
- Add rebase-git-caution-proceeds; the scenario count is 40.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- must_not_run's `git stash*` matched `git stash list`; the rebase
  scenarios now hold `git stash`, `push`, `save` and its flags.
- rebase-git-caution-proceeds' `*git merge*` matched `git merge-base`;
  it now holds `git merge ` only.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@mmaclay
mmaclay merged commit b59b7fa into main Nov 13, 2026
1 check passed
@mmaclay
mmaclay deleted the fix/rebase-leeway branch November 13, 2026 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant