CRLF -> LF in aliceclonergb JSON causing git diff #233
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I just fetched and merged upstream into my fork only to have a file pop up with untracked changes, even though I didn't touch it. It seems to be happening because of an inconsistency in the line endings in a file unrelated to anything I've touched. Git itself is fixing the issue automatically because the default git config is such that core.autocrlf is true unless otherwise specified explicitly; it is not set to false in this repo, so it's being fixed without me touching the file:
warning: in the working copy of 'keyboards/sneakbox/aliceclonergb/keymaps/vial/vial.json', CRLF will be replaced by LF the next time Git touches itThis means that I am unable to merge upstream into my own changes without committing the changes to this unrelated file as well, but that probably doesn't belong in the same commit or the same PR. Please merge the fixed version of the file so that Git stops whinging about it. Thanks!