decrease merge conflicts in whatsnew #310
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
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.
We occasionally run into a silly situation in which we need to resolve merge conflicts in a whatsnew file because multiple users have added new features.
This PR should reduce the number of merge conflicts in the whatsnew files by telling git to take the union of the changes to the whatsnew files. I saw this trick on an xarray PR, which got it from numpy/numpy#8612
The downside is that I (or whoever releases pvlib in the future) will probably need to remove some erroneous blank lines from the whatsnew file when preparing a release.
I tested this locally and it worked.