使用其版本的xcodeproj,然后手动添加您需要的所有内容。
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).
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.