Repository navigation
GitHub auto-merge called immediately after push gets 405 while mergeability is recomputing; race recovery repeats the same mistake - #758
Merged
Conversation
After pushing, poll GET /pulls/{n} until head.sha equals the pushed sha
and mergeable is non-null (bounded 60s settle, hot-reloadable knobs),
merging only when mergeable. A settled false with an unchanged base is a
genuine conflict routed to ReworkingForConflict outside the race-recovery
cap; an unknown mergeable retries the merge call without re-running the
merger. Failure text now carries the actual mergeable/mergeable_state
values and never blames another writer when the base did not move.
CodeyBox-Prompt-Revision: 1
Co-Authored-By: CodeyBox <noreply@codeybox.invalid>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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.
Automated via CodeyBox — work item 5f20c523b4e24bda963eda9f12cca598
Initiated by CodeyBox operator
Co-Authored-By: CodeyBox noreply@codeybox.invalid
🤖 Generated with CodeyBox