如何让Git将文件视为二进制文件？

Question

遇到中型项目的问题,因为git将它们视为文本和合并,因此Visual Studio项目文件会出现问题.我想将文件设置为二进制文件,以便git不会自动合并这些文件.

有没有办法做到这一点？

Answer 1

是的,使用属性.在你的.gitattributes文件中放置这样的东西(如果它不存在则创建它):

*.sln binary
*.suo binary
*.vcxproj binary

这binary实际上是一个预定义的宏,相当于-diff -merge -text.

如果你想仍然能够看到差异,你可以使用:

*.sln -merge -text

这样,*.sln文件将不会被合并,也不会被eol规范化,但同时也是差异化的.

Answer 2

您应该在.gitattributes文件中定义二进制文件属性(如果它不存在则创建它),方法是将这些行放入其中,以防止它将其作为文本diff文件处理:

# Define binary file attributes.
# - Do not treat them as text.
# - Include binary diff in patches instead of "binary files differ."
*.sln     -text diff
*.suo     -text diff
*.vcxproj -text diff
*.gif     -text diff
*.gz      -text diff
*.ico     -text diff
*.jpeg    -text diff