我应该在 SVN 中提交 .xcodeproj 文件吗？
我应该提交项目文件（.xcodeproj）吗？当我从一个系统提交此文件并在第二个系统上更新它时，该项目会损坏并且 Xcode 无法打开它。
这是预期的行为，还是我可能做错了什么？这是我忽略的文件列表：
<代码>*.o、*.lo、*.la、*.al、.libs、*.so、*.so.[0-9]*、*.a、*.pyc、*。 pyo,*.rej,*~,#*#,.#*,.*.swp,.DS_Store,*.pbxuser,*.透视图，*.perspectivev3，*.project.xcworkspace，*.xcuserdata，*.mode1v3，*.mode2v3，build/，build，/build/
我应该在这个列表中添加一些东西吗？我应该忘记 SVN 并改用 GIT 吗？
我使用 Cornerstone 作为 SVN 客户端并使用 Xcode 3.2.5
请帮忙；我被困住了！
Should I commit the project file (.xcodeproj)? When I commit this file from one system and update it on a second system, the project gets corrupted and Xcode won't open it.
Is this expected behavior, or am I maybe doing something wrong? Here is my list of ignored files:
*.o,*.lo,*.la,*.al,.libs,*.so,*.so.[0-9]*,*.a,*.pyc,*.pyo,*.rej,*~,#*#,.#*,.*.swp,.DS_Store,*.pbxuser,*.perspective,*.perspectivev3,*.project.xcworkspace,*.xcuserdata,*.mode1v3,*.mode2v3,build/,build,/build/
Should I add something to this list? Should I forget the SVN and switch to GIT?
I am using Cornerstone as SVN client and using Xcode 3.2.5
Please help; I am stuck!
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（3）
项目文件是project.pbxproj，是的，肯定是。 project.pbxproj是Xcode项目的重要文件。
The project file is project.pbxproj, Yes, definitely. project.pbxproj is an important file for Xcode project.
我对 Cornorstone 也有同样的问题，这是因为项目文件本身可能存在冲突。
原因之一是我从第一台机器添加了一个文件，但没有提交，在第二台机器上还添加了另一个文件。第一个提交没有问题，但第二个提交时就会发生冲突。另外，如果您更改了项目配置中的任何属性。
解决方法是用文本编辑器打开有冲突的工程文件并解决冲突。
I had the same problem with Cornorstone this is because the project file itself may have conflicts.
One reason for that was I added a file from first machine and I did not commit and on the second machine also another file was added. The first who commits does not have a problem but when the second commit a conflict will occur. And also if you changed any attribute in the project configuration.
A solution is to open the project file that has the conflict with text editor and solve the conflicts.
提交并跟踪它。具体来说，其中有一些您想要的内容 - 最重要的是project.pbxproj。看起来您已经忽略了特定于用户的部分（这很好）。
问题是，在分布式环境中经常会发生冲突。将您的项目和/或其定义分成更小的部分以避免这种风险。项目文件是文本格式 - 在某些情况下它会毫无问题地合并。
我不跟踪这些：
但您会想要跟踪 Xc4 中的新方案和工作区文件的一些。再次强调，不要费心跟踪用户定义的位，除非您真的希望跟踪它们，并且您是唯一做出承诺的人。
我建议的另一件事是构建到一个位于版本化源目录之外的中心位置 - 源中没有
build/目录，即使它们被忽略。do commit and track it. specifically, there are a few bits in there which you want - the most important is project.pbxproj. it looks like you have already ignored the user-specific pieces (which is good).
problem is, it will conflict often in distributed environments. break your projects and/or their definitions into smaller pieces to avoid this risk. the project file is a text format - it will merge without issue in some cases.
i do not track these:
but you'll want to track some of the scheme and workspace files, new in Xc4. again, don't bother tracking the user defined bits, unless you really like them to be tracked, and you are the only person committing.
another thing i recommend is to build to a central location which lies outside of your versioned source directories -- no
build/directories among the sources, even if they are ignored.