blocks|key|1280715|text|自从软件开发工具包发布以来，我一直致力于iPhone应用程序的开发，其中大部分时间都花在与多个开发人员组成的团队中。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1280716|事实是，禁止合并.pbxproj文件弊大于利。正如你所说，当你添加一个文件时，除非其他人获得该文件，否则他们也必须将它添加到他们的项目中-在任何大小的应用程序中，这都很糟糕，而且它还会失去源代码控制的巨大好处，因为你不能仅仅通过git就能真正恢复到一个完整的早期项目状态。|1280717|.pbxproj文件只是一个属性列表(类似于XML)。根据经验，只有当两个人同时添加文件时，你才会遇到合并冲突。在99%25的合并冲突案例中，解决方案是保留合并的两端，对于git来说，这至少包括删除任何>>>>、<<<<和====行。事实上，这种情况非常常见，以至于我创建了一个简单的shell脚本来修复来自git的处于合并状态的.pbxproj文件，我在项目目录中(在类级别)运行该脚本：|1280718|#!/bin/sh

++++projectfile=`find+-d+.+-name+'project.pbxproj'`
++++projectdir=`echo+*.xcodeproj`
++++projectfile="${projectdir}/project.pbxproj"
++++tempfile="${projectdir}/project.pbxproj.out"
++++savefile="${projectdir}/project.pbxproj.mergesave"

++++cat+$projectfile+%7C+grep+-v+"<<<<<<<+HEAD"+%7C+grep+-v+"======="+%7C+grep+-v+"%5E>>>>>>>+"+>+$tempfile
++++cp+$projectfile+$savefile
++++mv+$tempfile+$projectfile|code-block|syntax|javascript|1280719|最坏的情况是如果它失败了(你请求XCode加载项目，它加载失败)，你只需删除.pbxproj文件，从git中签出主文件，然后重新添加你的文件。但在使用这个脚本的几个月中，我从未遇到过这种情况，我再次与其他几个开发人员一起全职开发iPhone应用程序。|1280720|您可以尝试使用的另一个选项(在下面的注释中指出)是将此行添加到.gitattributes文件中：|1280721|*.pbxproj+text+-crlf+-diff+-merge=union|1280722|然后，git将始终对.pbxproject文件进行合并，与我提供的脚本具有相同的效果，而无需任何额外的工作。|1280723|最后，下面是我的完整.gitignore文件，显示了我将其设置为忽略的内容，因为有一些东西是您不想要的-在我的例子中，实际上只有emacs剩余部分和整个构建目录：|1280724|#+xcode+noise
build/*
*.pbxuser
*.mode1v3
*~

#+old+skool
.svn

#+osx+noise
.DS_Store
profile|1280725|entityMap^0|0|0|0|0|0|0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|Y|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|Z|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|10|8|@]|9|@]|A|$]]|$1|F|3|G|5|H|7|11|8|@]|9|@]|A|$I|J]]|$1|K|3|L|5|6|7|12|8|@]|9|@]|A|$]]|$1|M|3|N|5|6|7|13|8|@]|9|@]|A|$]]|$1|O|3|P|5|H|7|14|8|@]|9|@]|A|$I|J]]|$1|Q|3|R|5|6|7|15|8|@]|9|@]|A|$]]|$1|S|3|T|5|6|7|16|8|@]|9|@]|A|$]]|$1|U|3|V|5|H|7|17|8|@]|9|@]|A|$I|J]]|$1|W|3|-4|5|6|7|18|8|@]|9|@]|A|$]]]|X|$]]

I have worked on iPhone applications full time since the SDK launch, most of that time spent working on teams with multiple developers.

The truth is that it's way more harmful to disallow merging of that .pbxproj file than it is helpful. As you say, when you add a file unless other people get that file, they have to also add it to their project - in an application of any size, that sucks and it also takes away a huge benefit of source code control in that you cannot really revert to a complete earlier project state just through git.

The .pbxproj file is simply a property list (similar to XML). From experience, just about the ONLY merge conflict you were ever get is if two people have added files at the same time. The solution in 99% of the merge conflict cases is to keep both sides of the merge, which for git at least simply involves removing any >>>>, &lt;&lt;&lt;&lt;, and ==== lines. In fact this is so common that I have created a simple shell script to fix a .pbxproj file in a merge state from git, I run this from within the project directory (at the Classes level):

<pre><code>#!/bin/sh

 projectfile=`find -d . -name 'project.pbxproj'`
 projectdir=`echo *.xcodeproj`
 projectfile="${projectdir}/project.pbxproj"
 tempfile="${projectdir}/project.pbxproj.out"
 savefile="${projectdir}/project.pbxproj.mergesave"

 cat $projectfile | grep -v "&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD" | grep -v "=======" | grep -v "^&gt;&gt;&gt;&gt;&gt;&gt;&gt; " &gt; $tempfile
 cp $projectfile $savefile
 mv $tempfile $projectfile
</code></pre>

Worst case if it fails (you ask XCode to load the project and it fails to load), you simply delete the .pbxproj file, check out the master from git, and re-add your files. But I've never had that happen in many months of use with this script, again working full time on iPhone applications with several other developers.

Another option (pointed out in comments below) that you can try using in place of the script, is to add this line to a .gitattributes file:

<pre><code>*.pbxproj text -crlf -diff -merge=union
</code></pre>

Then git will always take both sides of a merge for the .pbxproject files, having the same effect as the script I provided only without any extra work.

Lastly, here is my complete .gitignore file, showing what I do have it set to ignore as there are a few things you don't want - in my case really just emacs remnants and the whole build directory:

<pre><code># xcode noise
build/*
*.pbxuser
*.mode1v3
*~

# old skool
.svn

# osx noise
.DS_Store
profile
</code></pre>

blocks|key|1065938|text|这在我的Xcode4.6和Git+1.7.5中都有效。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1065939|使用以下命令添加并提交.gitattributes文件：|1065940|*.pbxproj+binary+merge=union|code-block|syntax|javascript|1065941|我已经和另一个团队成员一起测试过了，效果很好。|1065942|摘自：http://robots.thoughtbot.com/post/33796217972/xcode-and-git-bridging-the-gap|offset|length|1065943|entityMap|0|LINK|mutability|MUTABLE|url|http://robots.thoughtbot.com/post/33796217972/xcode-and-git-bridging-the-gap^0|0|0|0|0|3|24|0|0^^$0|@$1|2|3|4|5|6|7|W|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|X|8|@]|9|@]|A|$]]|$1|D|3|E|5|F|7|Y|8|@]|9|@]|A|$G|H]]|$1|I|3|J|5|6|7|Z|8|@]|9|@]|A|$]]|$1|K|3|L|5|6|7|10|8|@]|9|@$M|11|N|12|1|13]]|A|$]]|$1|O|3|-4|5|6|7|14|8|@]|9|@]|A|$]]]|P|$Q|$5|R|S|T|A|$U|V]]]]

This works for me in Xcode 4.6 and Git 1.7.5. 

Add and commit .gitattributes file with this:

<pre><code>*.pbxproj binary merge=union
</code></pre>

I've tested this with another team member and works great.

Taken from:
<a href="http://robots.thoughtbot.com/post/33796217972/xcode-and-git-bridging-the-gap">http://robots.thoughtbot.com/post/33796217972/xcode-and-git-bridging-the-gap</a>

blocks|key|1065965|text|我确实创建了一个可以处理XCode项目文件中的合并冲突的Python脚本。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1065966|如果你想尝试一下，你可以在这里查看：https://github.com/simonwagner/mergepbx|offset|length|1065967|您必须将其作为合并驱动程序安装，以便在项目文件中存在合并冲突时自动调用它(+README.md将告诉您如何执行此操作)。|1065968|它应该比使用merge=union工作得更好，因为mergepbx理解您的项目文件的语义，因此将正确地解决冲突。|style|CODE|1065969|然而，这个项目仍然是alpha的，不要期望它能够理解所有的项目文件。|1065970|entityMap|0|LINK|mutability|MUTABLE|url|https://github.com/simonwagner/mergepbx^0|0|I|13|0|0|0|6|B|P|8|0|0^^$0|@$1|2|3|4|5|6|7|V|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|W|8|@]|9|@$D|X|E|Y|1|Z]]|A|$]]|$1|F|3|G|5|6|7|10|8|@]|9|@]|A|$]]|$1|H|3|I|5|6|7|11|8|@$D|12|E|13|J|K]|$D|14|E|15|J|K]]|9|@]|A|$]]|$1|L|3|M|5|6|7|16|8|@]|9|@]|A|$]]|$1|N|3|-4|5|6|7|17|8|@]|9|@]|A|$]]]|O|$P|$5|Q|R|S|A|$T|U]]]]

I did create a Python script that can handle merge conflicts in XCode Project files.

If you want to try it, you can check it out here: <a href="https://github.com/simonwagner/mergepbx" rel="nofollow">https://github.com/simonwagner/mergepbx</a>

You will have to install it as a merge driver, so it gets called automatically when you have a merge conflict in your project file (the README.md will tell you how to do that).

It should work much better than using <code>merge=union</code> as <code>mergepbx</code> understands the semantics of your project file and therefore will resolve the conflict correctly.

However the project is still alpha, don't expect it to understand every project file that is out there.

I have been an iphone developer for a while, and I have recently been including git in my workflow. I have used git settings found on <a href="http://shanesbrain.net/2008/7/9/using-xcode-with-git" rel="noreferrer">http://shanesbrain.net/2008/7/9/using-xcode-with-git</a> for my workflow so far.

Those settings tell git to exclude *.pbxproj from merges? Is there a real reason for doing this? For example, when I add a file to the project and push to origin, my fellow developers will not have that file added to their xcode project when they pull. Then if one of them builds a release this file may not be included. Shouldn't I just let git handle the merges for the project file? Why or why not this file should be in merges and how to properly handle the situation when files are added to the project?

How to use Git properly with Xcode?

软件开发

Python

我做iphone开发人员已经有一段时间了，最近我在我的工作流程中加入了git。到目前为止，我已经在我的工作流程中使用了上的git设置。这些设置告诉git从合并中排除*.pbxproj？这样做有真正的原因吗？例如，当我将一个文件添加到项目中并推送到源位置时，我的开发伙伴在拉入时不会将该文件添加到他们的xcode项目中。那...

问如何在Xcode中正确使用Git？
EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何在Xcode中正确使用Git？EN

社区

活动

资源

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问如何在Xcode中正确使用Git？
EN