Repository navigation
Upstream push loops forever when a retried item's own codeybox/<id> branch still holds a stale PR head - #704
Merged
Merged
Conversation
…failing forever
Retried items recompose their work on a fresh base, so the remote
codeybox/<id> ref (the previous attempt's head) is never an ancestor of
the new head. The push step now treats owned branches distinctly from
merge conflicts: plain push on fast-forward, --force-with-lease against
the recorded last-pushed SHA on divergence, and a terminal park (new
upstream_blocked failure kind, non-retryable, never conflict-rework)
when the lease mismatches or no lease base exists. The lease helpers
refuse non-codeybox prefixes and work==base by exact match, and the
GitHub remote re-checks mergeability after the rewrite, supersedes
stale closed PRs with linked fresh ones, and resumes already-merged PRs
by forge proof. A startup scan plus GET/POST operator endpoints re-drive
stranded Failed/Merged items under the same rules. Legacy git hosts
degrade to the historical plain push.
CodeyBox-Prompt-Revision: 1
Co-Authored-By: CodeyBox <noreply@codeybox.invalid>
CodeyBox-WorkItem: bd61e6009d3449378d37afc6bd2920bc CodeyBox-Agent: copilot/muse-spark-1.3-contributor CodeyBox-Prompt-Revision: 1 Co-Authored-By: CodeyBox <noreply@codeybox.invalid>
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.
Automated via CodeyBox — work item bd61e6009d3449378d37afc6bd2920bc
Initiated by CodeyBox operator
Co-Authored-By: CodeyBox noreply@codeybox.invalid
🤖 Generated with CodeyBox