Skip to content
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

meta: Merge master into develop #13772

Merged
merged 5 commits into from
Sep 25, 2024
Merged

meta: Merge master into develop #13772

merged 5 commits into from
Sep 25, 2024

Conversation

mydea
Copy link
Member

@mydea mydea commented Sep 24, 2024

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...

@mydea mydea marked this pull request as ready for review September 24, 2024 15:39
@mydea mydea requested review from a team as code owners September 24, 2024 15:39
@mydea mydea self-assigned this Sep 24, 2024
Copy link
Member

@Lms24 Lms24 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

@mydea
Copy link
Member Author

mydea commented Sep 24, 2024

Yeah, it's really fucked. But let's merge this and hopefully this will fix things (I guess?)

@Lms24
Copy link
Member

Lms24 commented Sep 24, 2024

Did I merge #13747 somehow incorrectly?

@mydea
Copy link
Member Author

mydea commented Sep 24, 2024

Did I merge #13747 somehow incorrectly?

Not that I could tell 🤔

Copy link
Member

@chargome chargome left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very strange but LGTM I guess 😄

Copy link
Member

@Lms24 Lms24 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 😅

@mydea mydea merged commit 0aac3c6 into develop Sep 25, 2024
137 checks passed
@mydea mydea deleted the fn/manual-sync branch September 25, 2024 06:52
@mydea mydea mentioned this pull request Sep 25, 2024
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants