Set merge=union Git attribute for CHANGELOG.md #335
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
Currently all PRs add a line to CHANGELOG.md, usually at the end. This means they almost always run into merge conflicts since they are adding different lines at the exact same place in the file. With merge=union Git will automatically resolve these merge conflicts by keeping all lines from both sides.
|
r? @eldruin (rust-highfive has picked a reviewer for you, use r? to override) |
dbrgn
approved these changes
Dec 20, 2021
eldruin
approved these changes
Dec 20, 2021
|
needs a "skip changelog" maybe? |
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.
Currently all PRs add a line to CHANGELOG.md, usually at the end. This means
they almost always run into merge conflicts since they are adding different lines at the exact same
place in the file.
With merge=union Git will automatically resolve these merge conflicts by keeping all lines from both sides.