This repository has been archived by the owner on Dec 13, 2018. It is now read-only.
chore(config): Add union merge strategy for README.md #30
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.
What:
With this inclusion git will attempt to keep multiple changes to a README to avoid conflicts
Why:
This is something I learned about here. That project had lots of changes to the README, and in
glamorous
theall-contributors
might cause unnecessary conflicts. This could be nice to have and avoid merging/rebasing a PR.How:
Small change in the
.gitattributes
file.More info is available here: isaacs/github#487