.gitattributes

# See https://help.github.com/articles/dealing-with-line-endings/

# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.java          text
*.xml           text
*.md            text
*.txt           text
.gitattributes  text
.gitignore      text
*.tmx           text
*.json          text

# Declare files that will always have CRLF line endings on checkout.
*.sln text eol=crlf
*.bat text eol=crlf

# Denote all files that are truly binary and should not be modified.
*.png binary
# just in case filesystem or git is case sensitive
*.PNG binary
*.jpg binary
*.gif binary
*.xcf binary
*.xcf binary
*.dll binary
*.jar binary

# See http://git-scm.com/book/en/v2/Customizing-Git-Git-Attributes#Merge-Strategies and http://stackoverflow.com/a/15233458
src/main/resources/checkstyle.xml   merge=ours
.gitignore                          merge=ours
.gitattributes                      merge=ours
README.md                           merge=ours
POM.xml                             merge=theirs

# See: http://git-scm.com/docs/gitattributes#__code_ident_code
*.java  ident

# See: https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html#_defining_a_custom_hunk_header
*.java diff=java