feat(pr): add --exit-on-conflict to stop waiting on unmergeable PRs - #620
Open
adamyeats wants to merge 1 commit into
Open
feat(pr): add --exit-on-conflict to stop waiting on unmergeable PRs#620adamyeats wants to merge 1 commit into
adamyeats wants to merge 1 commit into
Conversation
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.
A PR that conflicts with its base cannot merge without intervention, and GitHub runs no CI on it, so the
prwait sees an open PR with no failed checks and polls until the timeout. In pipelines where a conflicted PR means it was superseded by a newer write — automated deploy PRs updating one file, for example — the wait only delays the real outcome, and anything serialised behind the waiting workflow is blocked with it. We hit this with a rollout workflow holding a concurrency mutex for five hours against a deploy PR that a sibling pipeline had already superseded.--exit-on-conflict(default false) exits with code 1 when GitHub reports the PR'smergeable_stateasdirtyon three consecutive polls. The consecutive-polls guard covers GitHub computing mergeability lazily, where a single poll can transiently reportdirtywhile a background merge check runs. A clean observation resets the counter.