Skip to content

Conversation

benjchristensen
Copy link
Member

The encoding on these files is not liked by Git and it is forcing them to be updated.

/cc @akarnokd As you may want to look at your setup ... this happens somewhat often on commits from you.

I believe it is related to these .gitattribute settings:

# Set default behaviour, in case users don't have core.autocrlf set.
* text=auto

# Explicitly declare text files we want to always be normalized and converted 
# to native line endings on checkout.
*.java text
*.groovy text
*.scala text
*.clj text
*.txt text
*.md text

# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary

The encoding on these files is not liked by Git and it is forcing them to be updated.
benjchristensen added a commit that referenced this pull request May 28, 2014
@benjchristensen benjchristensen merged commit c6c17cc into ReactiveX:master May 28, 2014
@benjchristensen benjchristensen deleted the fix-formatting branch May 28, 2014 19:57
@akarnokd
Copy link
Member

I'm sorry, I sometimes forget to set the file encoding to LF on my Windows machine; Netbeans doesn't allow this to be set as default.

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