Git合并二进制文件(特别是Xcode项目文件)

但是对于.pbxproj文件,这可能不是一个好的选择,如described here.

Wrapping these files would only make the problem worse as far as I can tell – as you wold be completely unable to merge changes.
While you can merge project files in some cases,it’s not something that you should
count on being able to do. The basic recommendation is to avoid editing the project files at the same time as someone else.

我喜欢版本化项目文件(如ones for Eclipse),只有我知道它们是：

>经常不修改(当然不是每个开发人员都修改)
>仅使用相对路径
>没有一个工作站的数据细节

简而言之,如果这些文件不是要合并的(或者只是很容易合并),我希望它们在VCS中.在您的情况下,首先将它们放入所述VCS中可能没那么有用.

注意：如Git manual中所述：

During the merge,the index holds three versions of each file. Each of these three “file stages” represents a different version of the file:

$git show :1:file.txt  # the file in a common ancestor of both branches
$git show :2:file.txt  # the version from HEAD.
$git show :3:file.txt  # the version from MERGE_HEAD