- 
  Notifications
 You must be signed in to change notification settings 
- Fork 1.4k
Merge 4.9 into 5.0 #3377
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
 
  Closed
 
 
 
 
  Closed
 
 Merge 4.9 into 5.0 #3377
Conversation
 
 
 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
 
 
 
 
  @norareidy
 norareidy
 force-pushed
 the
 
 
 merge-4.9-into-5.0-1746473717908
 
 branch
 from
 May 5, 2025 19:47  
 
0dc4a99 to
 3bacfd8  
 Compare
 
 
 norareidy
 
  
 
 
 norareidy
 
 
 approved these changes
 
 
 May 5, 2025 
 
 
 
 
 
I will manually apply the change to 5.4 instead (5.0 doesn't need to be updated)
 
 auto-merge was automatically disabled
 May 5, 2025 19:58  
Pull request was closed
 
 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.
 
 
 
 
Uh oh!
There was an error while loading. Please reload this page.
Merge new changes from 4.9 into 5.0.
Commits
To resolve any conflicts, check out the temporary branch and run the following command:Resolving conflicts
To ignore from the remote branch, first reset the temporary branch to 5.0 and manually merge using the `ours` merge strategy:Ignoring changes
Then, push the temporary branch to upate the pull request.