git: set merge strategy for CHANGELOG.md to union
#1062
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
pstorz
changed the title
pstorz
changed the title
CHANGELOG.md to union
This patch adds a .gitattributes file that will configure the merge strategy for CHANGELOG.md to union. This will make sure conflict resolution will simply keep all lines added. This may produce bogus merges, but will usually do the right thing. As always, make sure to review your files after a merge.
pstorz
force-pushed
the
dev/arogge/master/changelog-union-merge
branch
from
b47a42f
to
4853b44
Compare
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.
This patch adds a .gitattributes file that will configure the merge
strategy for CHANGELOG.md to union. This will make sure conflict
resolution will simply keep all lines added.
This may produce bogus merges, but will usually do the right thing. As
always, make sure to review your files after a merge.
Thank you for contributing to the Bareos Project!
Please check
If you have any questions or problems, please give a comment in the PR.
Helpful documentation and best practices
Checklist for the reviewer of the PR (will be processed by the Bareos team)
General