CocoaPod报错:parsing unable to continue due to merge conflicts present in: the

今天给pod添加一个三方,install的时候,出现报错:



CocoaPod报错:parsing unable to continue due to merge conflicts present in: the_第1张图片

那么根据它的报错路经锁定了podfile.lock文件,然后通过文本编辑打开,发现以下情景,典型的代码合并冲突时候出现的冲突代码和冲突字符。

CocoaPod报错:parsing unable to continue due to merge conflicts present in: the_第2张图片

将冲突代码和冲突字符删除后还是报错,发现在pods文件夹里面还有一个Manifest.lock文件有问题,打开,重复以上步骤

CocoaPod报错:parsing unable to continue due to merge conflicts present in: the_第3张图片

然后cd   pod install,问题解决。

你可能感兴趣的:(CocoaPod报错:parsing unable to continue due to merge conflicts present in: the)