chore: sync main's released changelog sections back to develop - #756
Merged
Conversation
Release: develop → main
Release: develop → main (v2.15.2)
docs: cut changelog for v2.15.2
Release: develop -> main (v2.15.3)
docs: cut changelog for v2.15.3
The release workflow cuts [Unreleased] into a version section on main, and that commit never came back here, so develop still had the Discord login fix -- which shipped in 2.15.2 -- sitting under Unreleased, and no 2.15.2 or 2.15.3 headers at all. develop -> main then conflicted on the file, which is what blocks a release merge. Today's entries stay under Unreleased. The 2.15.2 ones move under their version alongside the three dependency bumps main recorded there, and the compare links match main. Claude-Session: https://claude.ai/code/session_01Nah4N2sGFs1TU2t7DXfKzJ
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Unblocks the release PR (#755), which is currently CONFLICTING.
release-changelog.ymlpromotes[Unreleased]into a version section onmainafter a release is published. That commit was never merged back todevelop, so the two files disagree structurally:develophas no## [2.15.2]or## [2.15.3]headers, and still carries the Discord login fix — which shipped in 2.15.2 — under[Unreleased].mainhas both headers, that entry filed under 2.15.2, and three dependency bumpsdevelophas never seen.Resolution keeps today's eight entries under
[Unreleased]and files the 2.15.2 ones under their own version, with the compare links matchingmain. Verified by diffing the result againstorigin/main: nothingmainhad is missing.Worth noting for next time — this is the third release in a row where the cut landed only on
main. Merging the auto-generateddocs: cut changelogPR intodevelopas well, or cherry-picking it, avoids the conflict entirely.https://claude.ai/code/session_01Nah4N2sGFs1TU2t7DXfKzJ