meta: Merge master into develop #13772
Merged
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
meta(changelog): Update changelog for 8.31.0
Lms24
reviewed
Sep 24, 2024
Member
Lms24
left a comment
Lms24
left a comment
There was a problem hiding this comment.
This seems completely off. develop already contains the version bumps as well as the the changelog entry for 8.31.0. How can there even be a diff?
Member
Author
|
Yeah, it's really fucked. But let's merge this and hopefully this will fix things (I guess?) |
Member
|
Did I merge #13747 somehow incorrectly? |
Member
Author
Not that I could tell 🤔 |
chargome
approved these changes
Sep 24, 2024
Member
chargome
left a comment
chargome
left a comment
There was a problem hiding this comment.
very strange but LGTM I guess 😄
Lms24
approved these changes
Sep 24, 2024
Member
Lms24
left a comment
Lms24
left a comment
There was a problem hiding this comment.
I guess this is partially explained by me squash and fast forward merging the previous manual sync. But I still don't understand the supposed file changes 😅
Merged
mydea
added a commit
that referenced
this pull request
Sep 25, 2024
Follow up to #13772, which kind of messed this up a bit...
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.
Not quite sure what is going on there, but let's try this again...
This seems very weird because the changes it shows are on develop, but maybe this helps somehow...