Skip to content

set eol to lf to avoid conflicting with editorconfig #2077

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

Merged
merged 1 commit into from
Feb 6, 2020
Merged

set eol to lf to avoid conflicting with editorconfig #2077

merged 1 commit into from
Feb 6, 2020

Conversation

jetersen
Copy link
Contributor

@jetersen jetersen commented Feb 5, 2020

The reason for this is as follows:

The configuration inside editorconfig will try and convert crlf to lf and git on checkout will convert all files from lf to crlf.
Creating an initial conversion in each file when you save them and on every commit git converts them back to crlf before commiting them as lf into the git repo 😓

by having both gitattributes and editorconfig align on lf the conversion will be avoided.
Also Microsoft recommends lf and UTF-8 without bom for all due to dotnet core.

@arturcic
Copy link
Member

arturcic commented Feb 6, 2020

LGTM!

@arturcic arturcic added this to the 5.1.4 milestone Feb 6, 2020
@arturcic arturcic merged commit 61ce893 into GitTools:master Feb 6, 2020
@arturcic
Copy link
Member

arturcic commented Feb 6, 2020

@Casz thank you so much for your contributions 👍

@gep13
Copy link
Member

gep13 commented Feb 6, 2020

@jetersen
Copy link
Contributor Author

jetersen commented Feb 6, 2020

Everything is already in line @gep13 again git kept the files in the repo as lf.
it was just that locally you got the conversion nightmare 😓

Running git add --renormalize . does not change any files :)

@jetersen jetersen deleted the gitattributes branch February 7, 2020 18:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants