I found that the highest answer did not work for me, so I thought I would post my usual approach here - since I just had to solve this problem:
We know the problem - the error is actually pretty clear on this problem:
Auto-merge SampleProject.xcodeproj / project.pbxproj CONFLICT (content): Merge conflict into SampleProject.xcodeproj / project.pbxproj Auto-merge error; fix conflicts and then record the result.
We have a conflict in the project.pbxproj file.
If he said “Conflict in appDelegate.h”, we knew exactly what to do, but the fact that the project will not compile seems more alarming than a normal conflict - that’s what it really is.
So how can we fix this conflict?
- First go to the project file
- Right click xcodeproj file
- Click Show Package Contents
- Double-click the project.pbxproj file (the one specified in the conflict error)
- Finally, resolve conflicts as usual. It takes a little thought - it’s worth reading and trying to understand what is happening. Usually, although it’s quite obvious that you need to save:
The above is an example of how conflicts will look.
Once you find all the conflicts in this file, just save and reload the project. The schema must be returned and the project works.
Note: As mentioned above, some thoughts are needed when resolving conflicts. Usually they will be very light (just remove the conflicting lines), but sometimes you need to fix some code. If you see the example below, the file was damaged and needed to be fixed:
The fix required in this example was:
path = DetailModels; sourceTree = "<group>"; };
This code needs to be added and can be generated from the code in the above areas.
simon_smiley
source share