Skip to content

Conversation

d-v-b
Copy link
Contributor

@d-v-b d-v-b commented Jul 3, 2025

This PR removes the changelogs and adds the release notes for our backported releases (3.0.9 and 3.0.10). This ensures that our next release off main (which hopefully is 3.1.0) has an accurate set of release notes.

d-v-b added 2 commits July 3, 2025 22:06
(cherry picked from commit 4c48e70)
(cherry picked from commit cff70a3)
@d-v-b d-v-b requested review from jhamman and normanrz July 3, 2025 20:12
@dstansby
Copy link
Contributor

dstansby commented Jul 6, 2025

Instead of doing it manually, might be nicer for the commit history/branches to merge the 3.0.10 branch into main?

@d-v-b
Copy link
Contributor Author

d-v-b commented Jul 9, 2025

Instead of doing it manually, might be nicer for the commit history/branches to merge the 3.0.10 branch into main?

that's a good idea!

@dstansby
Copy link
Contributor

dstansby commented Jul 9, 2025

I think you've merged main into this branch (3.0.9-3.0.10-release-notes), instead of merging the 3.0.10 branch into this branch?

@d-v-b
Copy link
Contributor Author

d-v-b commented Jul 9, 2025

the 3.0.10 branch has commits from backported PRs, I'm not sure we want that in main

@dstansby
Copy link
Contributor

dstansby commented Jul 9, 2025

That should be fine - the commit history is merged in, but the code changes don't apply because they're already on main. I had a go here: #3220

@dstansby
Copy link
Contributor

dstansby commented Jul 9, 2025

Hmm, all I did in #3220 was a single merge command, and there's 12 deleted changelog files. But here there's 17 deleted files... I wonder which one is correct?

@dstansby
Copy link
Contributor

dstansby commented Jul 9, 2025

Ah, it was because I needed to merge 3.0.9 in too.

@d-v-b
Copy link
Contributor Author

d-v-b commented Jul 9, 2025

closing as redundant due to #3220

@d-v-b d-v-b closed this Jul 9, 2025
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.

2 participants