Merge branch 'release-v4.9' into master #4373
Merged
Conversation
This file contains 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
|
Amxx
approved these changes
Jun 20, 2023
|
should this be squash or merged "normally" ? |
|
Squashed for now until we come up with a better alternative. |
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.
This brings the latest changes from
release-v4.9including the changelog and version header updates.This part of our release workflow is broken, as can be seen in #4366. Due to squashing these merge commits, resolved conflicts are "forgotten" and for each new patch we have to re-resolve them. I don't have a sustainable solution for this yet. In the meantime I did the merge manually.