Changelog entries for the bug-fix campaign - #108
Draft
cemde wants to merge 1 commit into
Draft
Conversation
One commit rather than one per branch: thirteen PRs appending to the same list conflict pairwise on merge, and GitHub does not apply the union merge driver that resolves it locally.
cemde
marked this pull request as draft
August 9, 2026 18:33
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.
Bug
Two problems with the per-PR approach.
Some fix PRs merged without a changelog entry (#95 among them), so
## [Unreleased]does not describe what shipped.And per-PR entries do not work here. Thirteen branches each append one line to the same
### Fixedlist, which conflicts pairwise: after #104 merged, #92 and #98 immediately went red onCHANGELOG.md.Impact
#105 added
CHANGELOG.md merge=unionto fix exactly this, and it does work with git locally. GitHub's merge button does not apply merge drivers, so it made no difference in practice.Fix
One commit with all twelve entries, plus one under Changed for #105 itself. The per-PR entries have been stripped from the open branches, which are all
MERGEABLEagain.Merge order
Land this after the remaining fix PRs. It names PRs that are still open; if any is dropped, delete its line first.
Covers #92 to #103, and #105. #104's entry is already on main.