How to merge conflicts project.pbxproj fille in Xcode - iPhone

Thursday

Merge the Xcode project.pbxproj and commit - iPhone:
                            To merge the .pbxproj file conflicts, simply rename your project extension with .txt instead of .xcodeproj and open the project.pbxproj (It's placed inside the .xcodeproj)with any text editor then search with <<<<< HEAD and  >>>>>, now just delete those merge markers and rename the project with original extension. You can follow the below steps. In this example my project name is myProject.pbxproj and it get conflicts.

• Rename myProject.xcodeproj into myProject.txt
• Open project.pbxproj into a text editor and search with <<<<< and  >>>>>
• Delete those merge markers
• Then rename myProject.txt into myProject.xcodeproj
  

Example:
Before merge  project.pbxproj file (your file contain some like this)

                   <<<<<<< HEAD
                CE880AEF14F516FB00948100 /* home.png in Resources */,
                CE880AF014F516FB00948100 /* default.png in Resources */,
=======
>>>>>>> f051c078e66e3970f5a15d851a40298f085e24b6

After merge project.pbxproj file

                CE880AEF14F516FB00948100 /* home.png in Resources */,
                CE880AF014F516FB00948100 /* default.png in Resources */,
 
Git commit project.pbxproj file after merge conflicts  :
                                 After merge conflicts if you get error message like "If this is not correct, please remove the file# .git/MERGE_HEAD" while try to commit your git repository. Don't worry you can easly solve this problem by provide a commit message for the merge operation.

                   git commit -m "Merge conflicts"
                             OR
                   git commit -a  -m "Merge conflicts"


 That's all. If this post is useful for you , please share this knowledge to your friends. Thanks!