Skip to content

Backmerge 5.2 into 6.0 - #420

Merged
RCheesley merged 13 commits into
5.2from
backmerge-5.2-into-6.0
Sep 11, 2025
Merged

Backmerge 5.2 into 6.0#420
RCheesley merged 13 commits into
5.2from
backmerge-5.2-into-6.0

Conversation

@matbcvo

@matbcvo matbcvo commented Sep 9, 2025

Copy link
Copy Markdown
Contributor

No merge conflicts

@matbcvo
matbcvo marked this pull request as ready for review September 9, 2025 12:42
@matbcvo
matbcvo requested a review from a team as a code owner September 9, 2025 12:42
@matbcvo
matbcvo requested review from adiati98 and fakela and removed request for a team September 9, 2025 12:42
@RCheesley

Copy link
Copy Markdown
Member

Broken links are not related to this PR so this is good to merge. Thanks @matbcvo !

@RCheesley
RCheesley merged commit 59a536a into 5.2 Sep 11, 2025
2 of 3 checks passed
@RCheesley

Copy link
Copy Markdown
Member

Wait a sec ... isn't this PR merging changes from 6 into 5? Not 5 into 6? Just checked the base branch. @matbcvo ?

@matbcvo

matbcvo commented Sep 11, 2025

Copy link
Copy Markdown
Contributor Author

@RCheesley, oops, I just noticed the PR's base branch was 5.2 instead of 6.0... Let's revert it.

@matbcvo
matbcvo deleted the backmerge-5.2-into-6.0 branch September 11, 2025 21:38
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