###################################################################### # Details per file setting: # text These files should be normalized (i.e. convert CRLF to LF). # binary These files are binary and should be left untouched. # # Note that binary is a macro for -text -diff. ###################################################################### ## AUTO-DETECT ## Handle line endings automatically for files detected as ## text and leave all files detected as binary untouched. ## This will handle all files NOT defined below. * text=auto eol=lf *.bat text eol=crlf *.sh text eol=lf *.js text *.jsx text *.json text *.md text *.html text *.css text *.scss text *.sass text *.py text *.jpg binary *.png binary *.pdf binary *.ico binary # SVG treated as an asset (binary) by default. If you want to treat it as text, # comment-out the following line and uncomment the line after. *.svg binary ## DOCKER *.dockerignore text Dockerfile text ## DOCUMENTATION *.md text *.txt text AUTHORS text CHANGELOG text CHANGES text CONTRIBUTING text COPYING text COPYRIGHT* text INSTALL text LICENSE text NEWS text README* text TODO text ## LINTERS .csslintrc text .eslintrc text .htmlhintrc text .jscsrc text .jshintrc text .jshintignore text .stylelintrc text ## ARCHIVES *.7z binary *.gz binary *.jar binary *.rar binary *.tar binary *.zip binary ## .NET *.cs diff=csharp ############################################################################### # Set the merge driver for project and solution files # # Merging from the command prompt will add diff markers to the files if there # are conflicts (Merging from VS is not affected by the settings below, in VS # the diff markers are never inserted). Diff markers may cause the following # file extensions to fail to load in VS. An alternative would be to treat # these files as binary and thus will always conflict and require user # intervention with every merge. To do so, just comment the entries below and # uncomment the group further below ############################################################################### *.sln text eol=crlf *.csproj text eol=crlf *.vbproj text eol=crlf *.vcxproj text eol=crlf *.vcproj text eol=crlf *.dbproj text eol=crlf *.fsproj text eol=crlf *.lsproj text eol=crlf *.wixproj text eol=crlf *.modelproj text eol=crlf *.sqlproj text eol=crlf *.wmaproj text eol=crlf *.xproj text eol=crlf *.props text eol=crlf *.filters text eol=crlf *.vcxitems text eol=crlf #*.sln merge=binary #*.csproj merge=binary #*.vbproj merge=binary #*.vcxproj merge=binary #*.vcproj merge=binary #*.dbproj merge=binary #*.fsproj merge=binary #*.lsproj merge=binary #*.wixproj merge=binary #*.modelproj merge=binary #*.sqlproj merge=binary #*.wwaproj merge=binary