UID2-6799 Call merge endpoint directly to honor ruleset bypass#221
Merged
UID2-6799 Call merge endpoint directly to honor ruleset bypass#221
Conversation
Replace `gh pr merge` with `gh api PUT .../merge`. `gh pr merge` reads `mergeStateStatus` client-side and refuses if BLOCKED, but that status ignores ruleset bypass actors — so PRs that would merge fine via a bypass actor get pre-emptively rejected with "base branch policy prohibits the merge" (cli/cli#9145). Hitting the endpoint directly lets the server evaluate rules and bypass at merge time. Effective merge strategy is unchanged (rebase on all branches; the `github.ref_protected == 'true'` comparison continues to return false).
39d9dd6 to
dc432d9
Compare
swibi-ttd
commented
Apr 22, 2026
swibi-ttd
commented
Apr 22, 2026
This reverts commit 106efad.
sophia-chen-ttd
approved these changes
Apr 22, 2026
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.
Summary
Replace
gh pr mergewithgh api PUT .../mergeincommit_pr_and_merge.Why
gh pr mergereadsmergeStateStatusclient-side and refuses ifBLOCKED. That status seems to be computed without regard for the caller's bypass rights, so PRs that would merge fine via a ruleset bypass actor get pre-emptively rejected with:Other changes