-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add .gitattributes to solve line endings cross-OS (merge after other PRs) #2484
Conversation
I am 👍 to this thanks @JeremybellEU :) |
e57c4bf
to
a9bf595
Compare
Thanks for your support @samccone . For future pull-requests in the affected files (total of 58 files), will generate full on diffs. If you want to prevent this, all files have to be fixed before that. However, in order to prevent merge issues, this should be done when merging. Because every single change in one of those 58 files (which is very very likely) will cause merge conflicts which are very hard to solve. Maybe the full diffs would be more suitable, to also keep |
yeah @JeremybellEU I think it would be wise to go ahead and correct the line endings across the project, but I am going to defer to the maintainers |
👍 |
a9bf595
to
bb453aa
Compare
Finally found time to create the issue: #2592 |
@JeremybellEU Thanks for this. We need it :) I think we'll need to wait to merge it until the other PRs are addressed. We're going to go through those on a weekly basis now. cc @tjsavage |
LGTM, but I'll hold off merging until after the next release. |
bb453aa
to
94c2bc2
Compare
Add .gitattributes to solve line endings cross-OS (merge after other PRs)
I'm reverting this patch for now. Too awkward to handle the file changes piecemeal. If we decide to merge this again, it will be with every file normalized at once. |
Yes merging this causes quite a headache if there are a lot of open PRs. I would suggest to only merge this if there is some sort of code-freeze/very few PRs. Then the merges are managable, right now with 40 open PRs it is probably a nightmare. For now I would advise all developers to set Off Topic: This whole line endings is just a pain if not done pre-emptively and git can't really deal with them nicely. |
Fixes Polymer#2592 Resolves Polymer#2484 Polymer#3164
When checking out Polymer on a Linux machine, several files will be completely added due to non-CRLF endings. Therefore if you edit just 1 line, the whole file will be triggered as changed.
This change prevents the git diff from being cluttered, uniforming all line-endings across the project.
Fixes #2592