Skip to content
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

Merged
merged 1 commit into from
Apr 7, 2017

Conversation

paulmolluzzo
Copy link
Collaborator

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 the all-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

With this inclusion git will attempt to keep multiple changes to a README to avoid conflicts

BREAKING CHANGE: none

none
@codecov-io
Copy link

Codecov Report

Merging #30 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@          Coverage Diff          @@
##           master    #30   +/-   ##
=====================================
  Coverage     100%   100%           
=====================================
  Files           2      2           
  Lines          60     60           
  Branches        9      9           
=====================================
  Hits           60     60

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f75fd45...c4847e1. Read the comment docs.

Copy link
Contributor

@kentcdodds kentcdodds left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool! I'm willing to give this a shot! If it works out well, then I'll add it to my generator. Thanks!

@kentcdodds kentcdodds merged commit 1293859 into master Apr 7, 2017
@kentcdodds kentcdodds deleted the add-merge-union-for-readme branch April 7, 2017 16:57
@paulmolluzzo
Copy link
Collaborator Author

paulmolluzzo commented Apr 7, 2017

I'm wondering if we should also add .all-contributorsrc as well. It's another file that will get mostly additions where we'll want to keep both. Look at the conflicting files for #27 as an example.

Could be worth waiting on though. I haven't used it on a js/json file before and it might break syntax. IDK.

@kentcdodds
Copy link
Contributor

Yeah, I still don't really understand what this does 😅

@paulmolluzzo
Copy link
Collaborator Author

If there are two additions on the same line it'll keep both additions.

@kentcdodds
Copy link
Contributor

Ah, yeah, better not then...

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants