Xcode Git Merge project.pbxproj文件

Question

I have 264 conflicts in my project.pbxproj file when I'm merging two local branches in Xcode. I tried my best to merge them but for some conflicts I cannot even see the drop down button to select left or right because there are just too many different parts. What should I do?

Answer 1

使用其版本的xcodeproj，然后手动添加您需要的所有内容。

Answer 2

Do not attempt to resolve the conflicts in this multicolumn display (which is basically Apple's own FileMerge application). It just can't handle this big a situation.

Instead, since a file with merge errors is just a normal text file with a bunch of very obvious markup showing what the problems are, open the file as text and resolve those errors manually in a text editor (such as BBEdit).