fix: use admin merge when direct merge is blocked by branch policy#1434
Open
fix: use admin merge when direct merge is blocked by branch policy#1434
Conversation
When the release bot's direct merge fails due to branch policy (e.g. the bot's approval doesn't satisfy the review requirement), try --admin merge first to leverage the app's ruleset bypass, falling back to --auto merge only if admin merge also fails. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #1434 +/- ##
=======================================
Coverage 35.09% 35.09%
=======================================
Files 54 54
Lines 4029 4029
=======================================
Hits 1414 1414
Misses 2461 2461
Partials 154 154 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
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
gh pr merge --squashfails due to branch policy, try--adminmerge first to leverage the app's ruleset bypass permissions--automerge only if admin merge also failsauthorAssociation: NONE)Context
The release failed because:
The
--adminflag bypasses branch protection rules, which the bot should be able to use given its ruleset bypass configuration.Test plan
🤖 Generated with Claude Code