fix: resolve pr head branch on merge-queue#164
Merged
Marcel Kräml (mkraeml) merged 2 commits intoJun 17, 2026
Merged
Conversation
Contributor
|
This will introduce the old behavior again 🙈 |
Contributor
|
I've changed the code to also resolve the |
Florian Ruppel (fruppel)
approved these changes
Jun 17, 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.
Problem
Since #163, branch sync ignores matching downstream branches in the queue.
Coupled upstream + downstream branches failing in the queue.
get_ref()detects the queue but no longer resolves the head branch:That ref never exists downstream, so step 1 always misses and falls back to
trunk.It's invisible for prs without a matching downstream branch.
#163 "queue stays open while downstream runs" is about timing and still holds. this
only re adds which branch to check out, a separate concern.
upstream: shopware/shopware#17306
downstream: https://github.com/shopware/SwagCommercial/pull/2907
faling commercial run: https://github.com/shopware/SwagCommercial/actions/runs/27616756826