有没有人找到合并Xcode项目或Core Data模型文件中更改的方法？ [英] Has anyone found a way to merge changes in Xcode project or Core Data model files?

问题描述

有没有办法使用VCS（我正在使用git），并使它与Xcode文件合并工作？例如，如果我的同事在该项目中添加新的组，则当我将他的更改合并时，我将该组合并为？

或者，如果他将一个attr添加到Core Data实体，我会在我的Core Data模型中获得该属性？

Xcode项目（project.pbxproj）文件通常会与一个例外：两个团队成员都将文件添加到同一个项目组。然后他们都倾向于整理项目文件中的同一行并导致冲突。在绝大多数情况下，依次接受两个编辑（顺序无关）会导致成功合并的文件。

Is there a way to use a VCS (I'm using git) and have it work with merges to the Xcode files? For example, if my co-worker adds a new Group to the project, when I merge in his changes, I get the Group merged in?

Or if he adds an attr to a Core Data entity, I get that attr in my Core Data model?

解决方案

Core Data and nib files don't merge well.

Xcode project (project.pbxproj) files generally do, with one exception: when two team members both add files to the same project group. Then they both tend to collate on the same line in the project file and cause a conflict. In the vast majority of cases, accepting both edits one after the other (order is irrelevant) results in a successfully merged file.

这篇关于有没有人找到合并Xcode项目或Core Data模型文件中更改的方法？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！