Repository navigation
fix: skip backports the release branch already has - #2432
Merged
Merged
Conversation
A fix backported by hand under a different patch cherry-picks as an empty commit, which failed the release as a conflict. Empty picks are now dropped and logged as already on the branch.
kpal81xd
added
bug
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
playcanvas-bot Bot
pushed a commit
that referenced
this pull request
Oct 22, 2026
A fix backported by hand under a different patch cherry-picks as an empty commit, which failed the release as a conflict. Empty picks are now dropped and logged as already on the branch. (cherry picked from commit baa05fe)
This branch was successfully deployed
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.
What's Changed
Patch releases stopped with "Backport of #2425 conflicts on release-2.35" even though #2425 was already on the release branch. It had been backported earlier with a slightly different lockfile diff, so
git cherrydidn't match it, and cherry-picking it again produced an empty commit.git cherry-pickexits non-zero on an empty result, and the release script treated that as a conflict.--empty=drop. A fix the branch already has is dropped and logged asSkipping #N: already on release-X.Y.Manual smoke test
patch. Expected: the log showsSkipping #2425: already on release-2.35, the remaining labelled fixes are backported, and the next patch tag is pushed.Checks