Components: Fixup changelog entry in wrong version #39450
Merged
Conversation
This file contains 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
ciampo
approved these changes
Mar 15, 2022
|
Nice catch! I had no idea that could happen. Now I'll try to keep an eye out on any rebase that includes changelog/text files. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixup for #39262
What?
Moves a new changelog entry for an unreleased version that was accidentally merged in under an already released version.
Why?
The text merging algorithm can merge lines into an unintended section, without flagging it as a conflict to be resolved manually. Happened to me too on a few PRs yesterday. Not sure how common this is 🤷