Fix releases/v3 branch - #4060
Merged
Merged
Conversation
oscarsj
approved these changes
Jul 31, 2026
oscarsj
left a comment
oscarsj
left a comment
Member
There was a problem hiding this comment.
👍🏾 thanks, this was a confusing step in the process
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.
On every recent CodeQL Action release, we have run into a merge conflict on the PR that merges back changes to the
releases/v3branch. That is because part of the mergeback PR process is to revert the most recent commit titled "Rebuild". Each time, the conflict has been resolved by rebuilding the JS and committing the resolution as "Rebuild", causing it to be discarded again the next time.This PR mirrors the mergeback process, with the exception of a separate commit to resolve the merge conflict, by:
During the next actual mergeback process, reverting the last two commits should then not revert the merge conflict resolution.