Skip to content
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 file. #20

Merged
merged 2 commits into from
Aug 6, 2021
Merged

Add .gitattributes file. #20

merged 2 commits into from
Aug 6, 2021

Conversation

cmumford
Copy link
Contributor

@cmumford cmumford commented Aug 3, 2021

@cmumford
Copy link
Contributor Author

cmumford commented Aug 5, 2021

OK. I removed all (all but *.sh) EOL specifications from both .editorconfig and .gitattributes. I know that Git can (and usually does) automatically convert EOL formats when checking out files, so I don't want to have these files causing problems for developers by changing EOL styles post checkout.

I do still have the odd EOL conflict when I develop locally because I checkout to Windows (CRLF), but then open WSL and operate on the same directory, but with an environment that is native LF. If I see a way to improve this then I will follow-up with another PR.

@kisvegabor
Copy link
Member

Thanks!

I do still have the odd EOL conflict when I develop locally because I checkout to Windows (CRLF), but then open WSL and operate on the same directory, but with an environment that is native LF. If I see a way to improve this then I will follow-up with another PR.

Ah, it's really an odd situation. But as you mentioned, I also think that git it usually smart enough to handle the line endings.

@kisvegabor kisvegabor merged commit f9db33e into lvgl:master Aug 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants