.gitattributes 1.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657
  1. ## Help git understand how to deal with Visual Studio specific files.
  2. ##
  3. ## Get latest from https://github.com/alexkaratarakis/gitattributes/blob/master/VisualStudio.gitattributes
  4. ###############################################################################
  5. # Set default behavior to automatically normalize line endings.
  6. ###############################################################################
  7. * text=auto
  8. ###############################################################################
  9. # Set the merge driver for project and solution files
  10. #
  11. # Merging from the command prompt will add diff markers to the files if there
  12. # are conflicts (Merging from VS is not affected by the settings below, in VS
  13. # the diff markers are never inserted). Diff markers may cause the following
  14. # file extensions to fail to load in VS. An alternative would be to treat
  15. # these files as binary and thus will always conflict and require user
  16. # intervention with every merge. To do so, just comment the entries below and
  17. # uncomment the group further below
  18. ###############################################################################
  19. *.sln text eol=crlf
  20. *.csproj text eol=crlf
  21. *.vbproj text eol=crlf
  22. *.vcxproj text eol=crlf
  23. *.vcproj text eol=crlf
  24. *.dbproj text eol=crlf
  25. *.fsproj text eol=crlf
  26. *.lsproj text eol=crlf
  27. *.wixproj text eol=crlf
  28. *.modelproj text eol=crlf
  29. *.sqlproj text eol=crlf
  30. *.wmaproj text eol=crlf
  31. *.xproj text eol=crlf
  32. *.props text eol=crlf
  33. *.filters text eol=crlf
  34. *.vcxitems text eol=crlf
  35. #*.sln merge=binary
  36. #*.csproj merge=binary
  37. #*.vbproj merge=binary
  38. #*.vcxproj merge=binary
  39. #*.vcproj merge=binary
  40. #*.dbproj merge=binary
  41. #*.fsproj merge=binary
  42. #*.lsproj merge=binary
  43. #*.wixproj merge=binary
  44. #*.modelproj merge=binary
  45. #*.sqlproj merge=binary
  46. #*.wwaproj merge=binary
  47. #*.xproj merge=binary
  48. #*.props merge=binary
  49. #*.filters merge=binary
  50. #*.vcxitems merge=binary