Use merge=union strategy for all version changelogs #21235
Merged
Conversation
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
rth
approved these changes
Oct 5, 2021
rth
reviewed
Oct 5, 2021
Co-authored-by: Roman Yurchak <rth.yurchak@gmail.com>
ogrisel
approved these changes
Oct 5, 2021
glemaitre
pushed a commit
to glemaitre/scikit-learn
that referenced
this pull request
Oct 23, 2021
Co-authored-by: Roman Yurchak <rth.yurchak@gmail.com>
glemaitre
pushed a commit
that referenced
this pull request
Oct 25, 2021
Co-authored-by: Roman Yurchak <rth.yurchak@gmail.com>
samronsin
pushed a commit
to samronsin/scikit-learn
that referenced
this pull request
Nov 30, 2021
Co-authored-by: Roman Yurchak <rth.yurchak@gmail.com>
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.
Reference Issues/PRs
It was done originally in #7896 but was not updated when we split the whats_new.rst into version-specific files.
What does this implement/fix? Explain your changes.
This should avoid most conflicts due to changelog changes. I noticed quite a few of them recently in PRs I was following.