Fix changelog for 2.3.6 - #1717
Merged
henrymercer merged 1 commit intoJun 5, 2023
Merged
henrymercer merged 1 commit into
henrymercer merged 1 commit into
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
adityasharad
approved these changes
Jun 5, 2023
adityasharad
left a comment
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
Separately tracking unreleased entries is a good idea, though perhaps confusing for OSS contributors. Let's figure out how to make that work and minimise conflicts.
Sorry, something went wrong.
angelapwen
approved these changes
Jun 5, 2023
Copy link
Copy Markdown
Contributor
There was a problem hiding this comment.
Thanks for catching. I'd noticed the same happening in the 2.3.5 release as well (a change from 2.3.5 was added to 2.3.3 as a result of a merge conflict resolution), but caught it in time during the release.
Sorry, something went wrong.
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
Reviewers
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.
One of the changelog entries for 2.3.6 ended up incorrectly being associated with 2.3.4 due to a bad merge conflict resolution. As a long term fix, we could store unreleased changelog entries in a separate directory and only edit CHANGELOG.md with automation.
Merge / deployment checklist