Created
May 27, 2012 06:58
-
-
Save anaisbetts/2802523 to your computer and use it in GitHub Desktop.
.gitattributes to solve your problems
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
| *.doc diff=astextplain | |
| *.DOC diff=astextplain | |
| *.docx diff=astextplain | |
| *.DOCX diff=astextplain | |
| *.dot diff=astextplain | |
| *.DOT diff=astextplain | |
| *.pdf diff=astextplain | |
| *.PDF diff=astextplain | |
| *.rtf diff=astextplain | |
| *.RTF diff=astextplain | |
| *.jpg binary | |
| *.png binary | |
| *.gif binary | |
| *.cs -text diff=csharp | |
| *.vb -text | |
| *.c -text | |
| *.cpp -text | |
| *.cxx -text | |
| *.h -text | |
| *.hxx -text | |
| *.py -text | |
| *.rb -text | |
| *.java -text | |
| *.html -text | |
| *.htm -text | |
| *.css -text | |
| *.scss -text | |
| *.sass -text | |
| *.less -text | |
| *.js -text | |
| *.lisp -text | |
| *.clj -text | |
| *.sql -text | |
| *.php -text | |
| *.lua -text | |
| *.m -text | |
| *.asm -text | |
| *.erl -text | |
| *.fs -text | |
| *.fsx -text | |
| *.hs -text | |
| *.csproj -text merge=union | |
| *.vbproj -text merge=union | |
| *.fsproj -text merge=union | |
| *.dbproj -text merge=union | |
| *.sln -text merge=union |
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
| ### Check me into the root of the repo | |
| ### as .gitattributes | |
| *.doc diff=astextplain | |
| *.DOC diff=astextplain | |
| *.docx diff=astextplain | |
| *.DOCX diff=astextplain | |
| *.dot diff=astextplain | |
| *.DOT diff=astextplain | |
| *.pdf diff=astextplain | |
| *.PDF diff=astextplain | |
| *.rtf diff=astextplain | |
| *.RTF diff=astextplain | |
| *.jpg binary | |
| *.png binary | |
| *.gif binary | |
| *.cs text=auto diff=csharp | |
| *.vb text=auto | |
| *.c text=auto | |
| *.cpp text=auto | |
| *.cxx text=auto | |
| *.h text=auto | |
| *.hxx text=auto | |
| *.py text=auto | |
| *.rb text=auto | |
| *.java text=auto | |
| *.html text=auto | |
| *.htm text=auto | |
| *.css text=auto | |
| *.scss text=auto | |
| *.sass text=auto | |
| *.less text=auto | |
| *.js text=auto | |
| *.lisp text=auto | |
| *.clj text=auto | |
| *.sql text=auto | |
| *.php text=auto | |
| *.lua text=auto | |
| *.m text=auto | |
| *.asm text=auto | |
| *.erl text=auto | |
| *.fs text=auto | |
| *.fsx text=auto | |
| *.hs text=auto | |
| *.csproj text=auto merge=union | |
| *.vbproj text=auto merge=union | |
| *.fsproj text=auto merge=union | |
| *.dbproj text=auto merge=union | |
| *.sln -text merge=union |
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
| ### Check me into the root of the repo | |
| ### as .gitattributes | |
| *.doc diff=astextplain | |
| *.DOC diff=astextplain | |
| *.docx diff=astextplain | |
| *.DOCX diff=astextplain | |
| *.dot diff=astextplain | |
| *.DOT diff=astextplain | |
| *.pdf diff=astextplain | |
| *.PDF diff=astextplain | |
| *.rtf diff=astextplain | |
| *.RTF diff=astextplain | |
| *.jpg binary | |
| *.png binary | |
| *.gif binary | |
| *.cs -text=auto diff=csharp | |
| *.vb -text=auto | |
| *.c -text=auto | |
| *.cpp -text=auto | |
| *.cxx -text=auto | |
| *.h -text=auto | |
| *.hxx -text=auto | |
| *.py -text=auto | |
| *.rb -text=auto | |
| *.java -text=auto | |
| *.html -text=auto | |
| *.htm -text=auto | |
| *.css -text=auto | |
| *.scss -text=auto | |
| *.sass -text=auto | |
| *.less -text=auto | |
| *.js -text=auto | |
| *.lisp -text=auto | |
| *.clj -text=auto | |
| *.sql -text=auto | |
| *.php -text=auto | |
| *.lua -text=auto | |
| *.m -text=auto | |
| *.asm -text=auto | |
| *.erl -text=auto | |
| *.fs -text=auto | |
| *.fsx -text=auto | |
| *.hs -text=auto | |
| *.csproj -text=auto merge=union | |
| *.vbproj -text=auto merge=union | |
| *.fsproj -text=auto merge=union | |
| *.dbproj -text=auto merge=union | |
| *.sln -text merge=union |
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
| ### Check me into the root of the repo | |
| ### as .gitattributes | |
| *.doc diff=astextplain | |
| *.DOC diff=astextplain | |
| *.docx diff=astextplain | |
| *.DOCX diff=astextplain | |
| *.dot diff=astextplain | |
| *.DOT diff=astextplain | |
| *.pdf diff=astextplain | |
| *.PDF diff=astextplain | |
| *.rtf diff=astextplain | |
| *.RTF diff=astextplain | |
| *.jpg binary | |
| *.png binary | |
| *.gif binary | |
| *.cs text=auto diff=csharp | |
| *.vb text=auto | |
| *.c text=auto | |
| *.cpp text=auto | |
| *.cxx text=auto | |
| *.h text=auto | |
| *.hxx text=auto | |
| *.py text=auto | |
| *.rb text=auto | |
| *.java text=auto | |
| *.html text=auto | |
| *.htm text=auto | |
| *.css text=auto | |
| *.scss text=auto | |
| *.sass text=auto | |
| *.less text=auto | |
| *.js text=auto | |
| *.lisp text=auto | |
| *.clj text=auto | |
| *.sql text=auto | |
| *.php text=auto | |
| *.lua text=auto | |
| *.m text=auto | |
| *.asm text=auto | |
| *.erl text=auto | |
| *.fs text=auto | |
| *.fsx text=auto | |
| *.hs text=auto | |
| *.csproj text=auto merge=union | |
| *.vbproj text=auto merge=union | |
| *.fsproj text=auto merge=union | |
| *.dbproj text=auto merge=union | |
| *.sln -text merge=union |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Those looking at using this gist may want to read this article: http://haacked.com/archive/2014/04/16/csproj-merge-conflicts/