docs: restore four changelog entries lost in a conflict resolution - #274
Merged
Conversation
#268, #269, #270 and #271 each landed with a CHANGELOG entry under `[Unreleased]`, and all four are missing from `main`. They were dropped by me while resolving the changelog collisions those four PRs had with each other: the script I used rebuilt a conflict region from the `### Heading` blocks it found inside it, and when a conflict fell *within* a section rather than around its heading it found none and wrote nothing. It never checked that its output was non-empty, so it failed silently — the same shape of defect as the quiet empty string #260 was about. The entries are restored verbatim as their authors wrote them. Nothing else changed: the code for all four is on main and was verified before each merge. Signed-off-by: Vyncint Ng <vyncint@icloud.com>
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.
[Unreleased]onmainhas an empty Changed section, and the entries from #268, #269, #270 and #271 are missing. All four PRs had them correctly placed when they were merged.What happened. Those four conflicted with each other on the same changelog lines, so I rebased each onto
mainas it moved and resolved the collision with a script. It rebuilt the conflict region from the### Headingblocks it found inside that region — which works when the conflict brackets a heading, and finds nothing when the conflict falls inside a section, as it did from #269 onward. With nothing found it wrote an empty string, and I did not assert the result was non-empty. It failed quietly, which is the one way a mistake like this survives review.What this changes. The four entries, restored verbatim as their authors wrote them, in merge order under Changed. No code changes; the implementations were each verified before merge and are unaffected.
Verified after restoring: all five merged issues are referenced in
[Unreleased], andextract-changelog.sh Unreleasedprints all five entries, so the next release's notes will carry them.