The Xcode project file cannot be opened. cannot be opened because the project file c

After svn updates the code, open the xcode project file and xxx appears .. xcodeproj cannot be opened because the project file cannot be parsed. because. the xcodeproj project file conflicts, and the update will still be forced. The internal file conflicts, so the file cannot be parsed. This conflicting message [cpp] <. mine 9ADAAC6A15DCEF6A0019ACA8 .... in Resources */, ======= 52FD7F3D15DCEAEF009E9322... in Resources */, >>>>>>>. r269 solution: 1. pair. right-click the xcodeproj file to display the package content. 2. double-click to open the project. pbxproj file 3. find the preceding conflict information (search by commad + f). 4. delete <, =====, >>>>> these rows 5. save and exit 6. open again. xcodeproj File