Fall back to auto-merge + branch update when direct merge fails#48
Open
ajpallares wants to merge 2 commits intomainfrom
Open
Fall back to auto-merge + branch update when direct merge fails#48ajpallares wants to merge 2 commits intomainfrom
ajpallares wants to merge 2 commits intomainfrom
Conversation
When the direct merge of a release PR fails (e.g. because the branch is not up-to-date with main), and merge queue is not in use, the job now: 1. Enables auto-merge on the PR 2. Updates the PR branch by merging the base branch into it This handles repos like purchases-flutter that require branches to be up-to-date before merging. Made-with: Cursor
Contributor
|
Your development orb has been published. It will expire in 30 days. |
Made-with: Cursor
Contributor
|
Your development orb has been published. It will expire in 30 days. |
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
merge-release-prjob now falls back to:This handles repos like
purchases-flutterthat have the "Require branches to be up to date before merging" branch protection rule. See this pipeline for an example of the failures this fixes.Depends on: fastlane-plugin-revenuecat_internal#125 (new
update_pr_branchaction).Test plan