Do you frequently hear yourself say "Don't touch the project file!", "Who overrode my changes?" or "Where did my file go?" If so, this talk is for you. We constantly put the project file on a pedestal of things-you-do-not-mess-with, but is this much caution really warranted? We'll cover tips, tricks, and solutions to promote harmony between you and your project file.
7. Falling back to patching base and 3-way merge...
Auto-merging MyApppp.xcodeproj/project.pbxproj
CONFLICT (content): Merge conflict in MyApp.xcodeproj/
project.pbxproj
Failed to merge in the changes.
Patch failed at 0037 launch screen images update
Saturday, April 20, 13