0

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?

enter image description here

Amy L.
  • 210
  • 2
  • 4
  • 14

2 Answers2

0

Use their version of the xcodeproj, then manually add everything you need back.

rexcalibur
  • 51
  • 5
0

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).

matt
  • 515,959
  • 87
  • 875
  • 1,141
  • But see https://roadfiresoftware.com/2015/09/automatically-resolving-git-merge-conflicts-in-xcodes-project-pbxproj/ for another suggestion. – matt Dec 12 '18 at 02:55