Repository navigation
release: v3.10.9 — a fix PR whose landing branch was merged and kept is retargeted to the default branch - #292
Merged
Merged
Conversation
…ledger lib/autofix-ship.sh:658) _fi_af_mwg_landed retargets to the default branch when the landing branch's tip is still the head that merged; _fi_af_mwg_squashed also reads a manual BaseRefChangedEvent. tests/autofix-merge-landed-base.bats 6/6, related merge files 43/43. Not yet: rebase onto fix/mwg-stale-landing (#290), version bump, CHANGELOG, full suite, live e2e. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01MVx3HWoDptxRUFfRDGQbYE
…ix-sweep.bats:1067 SIGPIPE flake) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01MVx3HTvihe7tJycZ7B7mjC
…is retargeted to the default branch Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01MVx3HTvihe7tJycZ7B7mjC
… is always brought up to date, protected and fork branches skipped, default lookup retried Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01MVx3HTvihe7tJycZ7B7mjC
…x-sweep.bats:1067 with #292 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01MVx3HTvihe7tJycZ7B7mjC
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
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.
Fixes ledger
lib/autofix-ship.sh:658(operator picked "retarget + rebuild") and thetests/autofix-sweep.bats:1067SIGPIPE flake.What changes
--guardwatcher) checks a fix PR's base: if that branch was merged into the default branch by a same-repo PR and its tip is still exactly the merged head, the PR is retargeted to the default branch. GitHub only does this itself when the branch is deleted; sayciao #320 sat ongsd/phase-24-resumeafter #318 because that repo keeps merged branches.BaseRefChangedEvent), otherwise the default branch is merged in; checks run again before merging.develop/release), fork PRs with the same branch name.Evidence
tests/autofix-merge-landed-base.bats11/11; the 5 review tests fail on the pre-review code. Merge test files 41/41.AltDoug/fi-rerun-e2e: test: bats-core suite + GitHub Actions CI (phase 6) #6 conflicting after retarget → retargeted, rebuilt, merged (onlyfix-landed.txt); docs: add statusline screenshot showing count surfacing (phase 9) #9 landing branch moved on → base kept, merged there; fix(docs): demo-storyboard order bug + use uncropped statusline (phase 11) #11 mergeable after retarget → still rebuilt to one commit, merged; Fix: marketplace.json missing required name + owner fields #13--guard→ retargeted + rebuilt, never merged itself.🤖 Generated with Claude Code
https://claude.ai/code/session_01MVx3HTvihe7tJycZ7B7mjC