Change CHANGELOG.md merge strategy to union #1116
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
- This makes CHANGELOG don't conflict as much (or at all).
|
Nice! |
|
Oh wow that was fast 馃槀 I didn't have time to fix the comment above 馃檲 Cheers! |
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.
Hey 馃憢
I noticed users are supposed to include changes to CHANGELOG.md on every PR. This causes unnecessary merge conflicts that we could avoid if we changed the merge strategy to "union". What this does is that whenever it finds a merge conflict, it will resolve it automatically by accepting both entries. I believe that's always the case for the CHANGELOG file.
I've been using this in other projects to auto-resolve conflicts of files and it works wonders 馃
For more info: https://git-scm.com/docs/gitattributes
Hope this helps! 馃挭