Fix duplicate changelog entry in post-release PR#480
Merged
laurit merged 2 commits intoMay 12, 2026
Conversation
…angelog-duplicate
laurit
approved these changes
May 12, 2026
Ari4ka
approved these changes
May 12, 2026
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
3 participants
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.
The post-release workflow generated a duplicate
## Version 1.41.1heading in #479. Root cause:merge-change-log-after-release.shwas copied from other Java repos where patch releases are cut from the prior minor's release branch (so the patch heading is not yet onmainand must be prepended). In this repo, patch releases also go through theprepare-release-branchworkflow, which already adds the heading tomain— so the "patch release" branch prepended a second copy.1.41.1 was the first patch release this repo cut via this workflow, which is why this only surfaced now.
This PR removes the patch-vs-minor conditional (always take the "heading already exists" path) and adds a comment explaining the divergence from other Java repos so it isn't accidentally re-synced.