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

crlf replaced by lf #892

Merged
merged 2 commits into from
Mar 25, 2024
Merged

crlf replaced by lf #892

merged 2 commits into from
Mar 25, 2024

Conversation

vncoelho
Copy link
Member

close #891

@vncoelho
Copy link
Member Author

There is a strange error, trying to fix this "corrupted" file

@cschuchardt88
Copy link
Member

@vncoelho Please close PR and do #891 (comment)

@vncoelho
Copy link
Member Author

I will double check

@cschuchardt88
Copy link
Member

@vncoelho Checkout #893

@vncoelho
Copy link
Member Author

Looks good,but what is the difference from the PR I opened? The file fix looks the same.
The other change looks good, is to avoid for future,right?

@cschuchardt88
Copy link
Member

cschuchardt88 commented Mar 23, 2024

@vncoelho I could not change config.json back to CRLF; see notes below for reason why.

You Add to .gitattributes File

  • *.json text eol=lf
    • Note: This will automatically normalizes & changes line endings for all *.json files on push/commit.

@Jim8y
Copy link
Contributor

Jim8y commented Mar 23, 2024

@vncoelho the code itself is right, but you have to update your local setting.

@vncoelho
Copy link
Member Author

@vncoelho I could not change config.json back to CRLF; see notes below for reason why.

You Add to .gitattributes File

  • *.json text eol=lf
    • Note: This will automatically normalizes & changes line endings for all *.json files on push/commit.

Great, I was thinking about some change to enforce it. It is great that you found the solution.

@vncoelho
Copy link
Member Author

@vncoelho the code itself is right, but you have to update your local setting.

I do not know what you are trying to say,@vncoelho.
The local setting is the same as before.

@cschuchardt88
Copy link
Member

Great, I was thinking about some change to enforce it. It is great that you found the solution.

@vncoelho We had problems last year with this happening; guess I missed a file.

@dusmart
Copy link

dusmart commented Mar 25, 2024

I faced the same problem, too.

Seems that the crlf are introduced in https://github.com/neo-project/neo-modules/pull/865/files. see git diff -R 79f0d78 origin/master src/ApplicationLogs/config.json

This fix should be sufficient.

@cschuchardt88
Copy link
Member

cschuchardt88 commented Mar 25, 2024

@vncoelho

  • Add this line *.json text eol=lf to .gitattributes file for this PR to be complete.

@vncoelho
Copy link
Member Author

Soon I will be in the computer as well.

@vncoelho
Copy link
Member Author

@vncoelho

* Add this line `*.json text eol=lf` to `.gitattributes` file for this PR to be complete.

done

@vncoelho vncoelho merged commit a2a9d4f into master Mar 25, 2024
4 checks passed
@vncoelho vncoelho deleted the core-fix-crlf branch March 25, 2024 11:37
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.

modified file when clonning repo
5 participants