热门标签 | HotTags
当前位置:  开发笔记 > 编程语言 > 正文

CocoaPod更新第三方库列表是出现自动Merge出错怎么办

起因及现象:深夜加班,准备把一个多月没用的CocoaPods神器祭出来。没想到悲催得碰到如下错误提示:[!]Pod::ExecutablepullAuto-mergin

起因及现象:

深夜加班,准备把一个多月没用的CocoaPods神器祭出来。没想到悲催得碰到如下错误提示:

[!] Pod::Executable pull
Auto-merging geos/3.4.2/geos.podspec
CONFLICT (add/add): Merge conflict in geos/3.4.2/geos.podspec
Auto-merging Typhoon/1.6.6/Typhoon.podspec
CONFLICT (add/add): Merge conflict in Typhoon/1.6.6/Typhoon.podspec
Auto-merging Typhoon/1.6.5/Typhoon.podspec
CONFLICT (add/add): Merge conflict in Typhoon/1.6.5/Typhoon.podspec
Auto-merging Typhoon/1.6.3/Typhoon.podspec
CONFLICT (add/add): Merge conflict in Typhoon/1.6.3/Typhoon.podspec
Auto-merging Typhoon/1.6.2/Typhoon.podspec
CONFLICT (add/add): Merge conflict in Typhoon/1.6.2/Typhoon.podspec
Auto-merging Typhoon/1.6.1/Typhoon.podspec
CONFLICT (add/add): Merge conflict in Typhoon/1.6.1/Typhoon.podspec
Auto-merging Typhoon/1.6.0/Typhoon.podspec
CONFLICT (add/add): Merge conflict in Typhoon/1.6.0/Typhoon.podspec
Auto-merging Typhoon/1.5.9/Typhoon.podspec
CONFLICT (add/add): Merge conflict in Typhoon/1.5.9/Typhoon.podspec
Auto-merging Typhoon/1.5.8/Typhoon.podspec
CONFLICT (add/add): Merge conflict in Typhoon/1.5.8/Typhoon.podspec
Auto-merging Typhoon/1.5.7/Typhoon.podspec
CONFLICT (add/add): Merge conflict in Typhoon/1.5.7/Typhoon.podspec
Auto-merging Typhoon/1.5.6/Typhoon.podspec
CONFLICT (add/add): Merge conflict in Typhoon/1.5.6/Typhoon.podspec
Auto-merging Typhoon/1.5.5/Typhoon.podspec
CONFLICT (add/add): Merge conflict in Typhoon/1.5.5/Typhoon.podspec
Auto-merging Typhoon/1.5.4/Typhoon.podspec
CONFLICT (add/add): Merge conflict in Typhoon/1.5.4/Typhoon.podspec
Auto-merging Typhoon/1.5.3/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.5.3/Typhoon.podspec
Auto-merging Typhoon/1.5.2/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.5.2/Typhoon.podspec
Auto-merging Typhoon/1.5.1/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.5.1/Typhoon.podspec
Auto-merging Typhoon/1.5.0/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.5.0/Typhoon.podspec
Auto-merging Typhoon/1.3.8/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.3.8/Typhoon.podspec
Auto-merging Typhoon/1.3.7/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.3.7/Typhoon.podspec
Auto-merging Typhoon/1.3.6/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.3.6/Typhoon.podspec
Auto-merging Typhoon/1.3.5/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.3.5/Typhoon.podspec
Auto-merging Typhoon/1.3.4/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.3.4/Typhoon.podspec
Auto-merging Typhoon/1.3.3/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.3.3/Typhoon.podspec
Auto-merging Typhoon/1.3.2/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.3.2/Typhoon.podspec
Auto-merging Typhoon/1.3.1/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.3.1/Typhoon.podspec
Auto-merging Typhoon/1.3.0/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.3.0/Typhoon.podspec
Auto-merging Typhoon/1.2.9/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.2.9/Typhoon.podspec
Auto-merging Typhoon/1.2.8/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.2.8/Typhoon.podspec
Auto-merging Typhoon/1.2.7/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.2.7/Typhoon.podspec
Auto-merging Typhoon/1.2.6/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.2.6/Typhoon.podspec
Auto-merging Typhoon/1.2.5/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.2.5/Typhoon.podspec
Auto-merging Typhoon/1.2.4/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.2.4/Typhoon.podspec
Auto-merging Typhoon/1.2.3/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.2.3/Typhoon.podspec
Auto-merging Typhoon/1.2.2/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.2.2/Typhoon.podspec
Auto-merging Typhoon/1.2.1/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.2.1/Typhoon.podspec
Auto-merging Typhoon/1.2.0/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.2.0/Typhoon.podspec
Auto-merging Typhoon/1.1.9/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.1.9/Typhoon.podspec
Auto-merging Typhoon/1.1.8/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.1.8/Typhoon.podspec
Auto-merging Typhoon/1.1.7/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.1.7/Typhoon.podspec
Auto-merging Typhoon/1.1.6/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.1.6/Typhoon.podspec
Auto-merging Typhoon/1.1.5/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.1.5/Typhoon.podspec
Auto-merging Typhoon/1.1.4/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.1.4/Typhoon.podspec
Auto-merging Typhoon/1.1.3/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.1.3/Typhoon.podspec
Auto-merging Typhoon/1.1.2/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.1.2/Typhoon.podspec
Auto-merging Typhoon/1.1.10/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.1.10/Typhoon.podspec
Auto-merging Typhoon/1.1.1/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.1.1/Typhoon.podspec
Auto-merging Typhoon/1.1.0/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.1.0/Typhoon.podspec
Auto-merging Typhoon/1.0.9/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.0.9/Typhoon.podspec
Auto-merging Typhoon/1.0.8/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.0.8/Typhoon.podspec
Auto-merging Typhoon/1.0.7/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.0.7/Typhoon.podspec
Auto-merging Typhoon/1.0.6/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.0.6/Typhoon.podspec
Auto-merging Typhoon/1.0.5/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.0.5/Typhoon.podspec
Auto-merging Typhoon/1.0.4/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.0.4/Typhoon.podspec
Auto-merging Typhoon/1.0.3/Typhoon.podspec
CONFLICT (content): Merge conflict in Typhoon/1.0.3/Typhoon.podspec
Auto-merging SupportKit/1.0/SupportKit.podspec
CONFLICT (add/add): Merge conflict in SupportKit/1.0/SupportKit.podspec
Auto-merging SBJson4/4.0.0/SBJson4.podspec
CONFLICT (add/add): Merge conflict in SBJson4/4.0.0/SBJson4.podspec
Auto-merging SBJson/4.0.0/SBJson.podspec
CONFLICT (add/add): Merge conflict in SBJson/4.0.0/SBJson.podspec
Auto-merging RegExCategories/1.0/RegExCategories.podspec
CONFLICT (add/add): Merge conflict in RegExCategories/1.0/RegExCategories.podspec
Auto-merging Raygun4iOS/1.1.1/Raygun4iOS.podspec
CONFLICT (add/add): Merge conflict in Raygun4iOS/1.1.1/Raygun4iOS.podspec
Auto-merging ProximityKit/0.2.3/ProximityKit.podspec
CONFLICT (add/add): Merge conflict in ProximityKit/0.2.3/ProximityKit.podspec
Auto-merging Pixate/2.0.1/Pixate.podspec
CONFLICT (add/add): Merge conflict in Pixate/2.0.1/Pixate.podspec
Auto-merging OctoKit/0.4/OctoKit.podspec
CONFLICT (add/add): Merge conflict in OctoKit/0.4/OctoKit.podspec
Auto-merging ObjectiveSugar/1.1.0/ObjectiveSugar.podspec
CONFLICT (add/add): Merge conflict in ObjectiveSugar/1.1.0/ObjectiveSugar.podspec
Auto-merging ObjectiveSugar/1.0.0/ObjectiveSugar.podspec
CONFLICT (add/add): Merge conflict in ObjectiveSugar/1.0.0/ObjectiveSugar.podspec
Auto-merging NSString+TBEncryption/1.0/NSString+TBEncryption.podspec
CONFLICT (add/add): Merge conflict in NSString+TBEncryption/1.0/NSString+TBEncryption.podspec
Auto-merging NRTouchPoints/0.1.0/NRTouchPoints.podspec
CONFLICT (add/add): Merge conflict in NRTouchPoints/0.1.0/NRTouchPoints.podspec
Auto-merging MagicPie/1.0.0/MagicPie.podspec
CONFLICT (add/add): Merge conflict in MagicPie/1.0.0/MagicPie.podspec
Auto-merging LetsMove/1.9/LetsMove.podspec
CONFLICT (add/add): Merge conflict in LetsMove/1.9/LetsMove.podspec
Auto-merging KEZCollectionViewTableLayout/1.0/KEZCollectionViewTableLayout.podspec
CONFLICT (add/add): Merge conflict in KEZCollectionViewTableLayout/1.0/KEZCollectionViewTableLayout.podspec
Auto-merging JavascriptCoreOpalAdditions/0.3.1/JavascriptCoreOpalAdditions.podspec
CONFLICT (add/add): Merge conflict in JavascriptCoreOpalAdditions/0.3.1/JavascriptCoreOpalAdditions.podspec
Auto-merging JavascriptCoreOpalAdditions/0.3.0/JavascriptCoreOpalAdditions.podspec
CONFLICT (add/add): Merge conflict in JavascriptCoreOpalAdditions/0.3.0/JavascriptCoreOpalAdditions.podspec
Auto-merging JavascriptCoreOpalAdditions/0.2.4/JavascriptCoreOpalAdditions.podspec
CONFLICT (add/add): Merge conflict in JavascriptCoreOpalAdditions/0.2.4/JavascriptCoreOpalAdditions.podspec
Auto-merging JavascriptCoreOpalAdditions/0.2.3/JavascriptCoreOpalAdditions.podspec
CONFLICT (add/add): Merge conflict in JavascriptCoreOpalAdditions/0.2.3/JavascriptCoreOpalAdditions.podspec
Auto-merging JavascriptCoreOpalAdditions/0.2.2/JavascriptCoreOpalAdditions.podspec
CONFLICT (add/add): Merge conflict in JavascriptCoreOpalAdditions/0.2.2/JavascriptCoreOpalAdditions.podspec
Auto-merging JavascriptCoreOpalAdditions/0.2.1/JavascriptCoreOpalAdditions.podspec
CONFLICT (add/add): Merge conflict in JavascriptCoreOpalAdditions/0.2.1/JavascriptCoreOpalAdditions.podspec
Auto-merging JavascriptCoreOpalAdditions/0.2.0/JavascriptCoreOpalAdditions.podspec
CONFLICT (add/add): Merge conflict in JavascriptCoreOpalAdditions/0.2.0/JavascriptCoreOpalAdditions.podspec
Auto-merging JavascriptCoreOpalAdditions/0.1.0/JavascriptCoreOpalAdditions.podspec
CONFLICT (add/add): Merge conflict in JavascriptCoreOpalAdditions/0.1.0/JavascriptCoreOpalAdditions.podspec
Auto-merging JPSDisplayLink/0.0.1/JPSDisplayLink.podspec
CONFLICT (add/add): Merge conflict in JPSDisplayLink/0.0.1/JPSDisplayLink.podspec
Adding ILTranslucentView/0.0.1/ILTranslucentView.podspec
CONFLICT (file/directory): There is a directory with name ILTranslucentView in af97e1583ad2580daed0287d2312797cf4fd7427. Adding ILTranslucentView as ILTranslucentView~HEAD
Auto-merging IGJavascriptConsole/0.1.1/IGJavascriptConsole.podspec
CONFLICT (add/add): Merge conflict in IGJavascriptConsole/0.1.1/IGJavascriptConsole.podspec
Auto-merging HockeySDK-Mac/2.0.0/HockeySDK-Mac.podspec
CONFLICT (add/add): Merge conflict in HockeySDK-Mac/2.0.0/HockeySDK-Mac.podspec
Removing HeapAnalytics/0.0.1/HeapAnalytics.podspec
Auto-merging GeotriggerSDK/0.2.1/GeotriggerSDK.podspec
CONFLICT (add/add): Merge conflict in GeotriggerSDK/0.2.1/GeotriggerSDK.podspec
Auto-merging GeotriggerSDK/0.2.0/GeotriggerSDK.podspec
CONFLICT (add/add): Merge conflict in GeotriggerSDK/0.2.0/GeotriggerSDK.podspec
Auto-merging GeotriggerSDK/0.1.2/GeotriggerSDK.podspec
CONFLICT (add/add): Merge conflict in GeotriggerSDK/0.1.2/GeotriggerSDK.podspec
Auto-merging GeotriggerSDK/0.1.1/GeotriggerSDK.podspec
CONFLICT (add/add): Merge conflict in GeotriggerSDK/0.1.1/GeotriggerSDK.podspec
Auto-merging GeotriggerSDK/0.1.0/GeotriggerSDK.podspec
CONFLICT (add/add): Merge conflict in GeotriggerSDK/0.1.0/GeotriggerSDK.podspec
Auto-merging GBDeviceInfo/2.2.5/GBDeviceInfo.podspec
CONFLICT (add/add): Merge conflict in GBDeviceInfo/2.2.5/GBDeviceInfo.podspec
Removing DZCategories/1.0.2/DZCategories.podspec
Auto-merging DFPickerView/0.0.1/DFPickerView.podspec
CONFLICT (add/add): Merge conflict in DFPickerView/0.0.1/DFPickerView.podspec
Auto-merging DBChooser/1.1/DBChooser.podspec
CONFLICT (add/add): Merge conflict in DBChooser/1.1/DBChooser.podspec
Adding Countly/2.0.0/Countly.podspec
CONFLICT (file/directory): There is a directory with name Countly/2.0.0 in af97e1583ad2580daed0287d2312797cf4fd7427. Adding Countly/2.0.0 as Countly/2.0.0~HEAD
CONFLICT (modify/delete): CoreParse/1.1/CoreParse.podspec deleted in HEAD and modified in af97e1583ad2580daed0287d2312797cf4fd7427. Version af97e1583ad2580daed0287d2312797cf4fd7427 of CoreParse/1.1/CoreParse.podspec left in tree.
Auto-merging CocoaSPDY/1.0.0/CocoaSPDY.podspec
CONFLICT (add/add): Merge conflict in CocoaSPDY/1.0.0/CocoaSPDY.podspec
CONFLICT (rename/rename): Rename CardIO/3.3.0/CardIO.podspec->CardIO/3.4.1/CardIO.podspec in af97e1583ad2580daed0287d2312797cf4fd7427. Rename CardIO/3.2.2/CardIO.podspec->CardIO/3.4.1/CardIO.podspec in HEAD
Renaming CardIO/3.3.0/CardIO.podspec to CardIO/3.4.1/CardIO.podspec~af97e1583ad2580daed0287d2312797cf4fd7427 and CardIO/3.2.2/CardIO.podspec to CardIO/3.4.1/CardIO.podspec~HEAD instead
CONFLICT (rename/rename): Rename "CardIO/3.2.3/CardIO.podspec"->"CardIO/3.4.0/CardIO.podspec" in branch "HEAD" rename "CardIO/3.2.3/CardIO.podspec"->"CardIO/3.4.4/CardIO.podspec" in "af97e1583ad2580daed0287d2312797cf4fd7427"
Auto-merging BlockRSSParser/2.1/BlockRSSParser.podspec
CONFLICT (add/add): Merge conflict in BlockRSSParser/2.1/BlockRSSParser.podspec
Auto-merging .travis.yml
CONFLICT (content): Merge conflict in .travis.yml
Automatic merge failed; fix conflicts and then commit the result.
From https://github.com/CocoaPods/Specs
+ a75d34f...af97e15 master -> origin/master (forced update)
240a3d7..25774a3 post_install -> origin/post_install
看到错误码后猜到应该是跟git相关得问题。又到搬出stackoverflow得时候了。一番搜索,有了一些收获。不敢藏私,与大家分享下:


解决方法:

其实一般git这种问题原理很简单,CocoaPods文件存储目录我们平时是绝对不会改的,那现在出现冲突了肯定是非正常原因造成的。那我们只要为CocoaPods恢复一个干净的文件目录不就行了么。可是CocoaPods的主文件目录在哪呢。从Stackoverflow那,我得到了答案。以下命令就是定位到该目录,并使用git命令晴空我们本地所有的更改。

cd ~/.cocoapods/repos/master
git reset --hard origin/master

参考网址

https://github.com/CocoaPods/CocoaPods/issues/776


官方说明:

http://blog.cocoapods.org/Repairing-Our-Broken-Specs-Repository/

CocoaPod更新第三方库列表是出现自动Merge出错怎么办,布布扣,bubuko.com


推荐阅读
  • 本文探讨了Java编程语言中常用的两个比较操作符==和equals方法的区别及其应用场景。通过具体示例分析,帮助开发者更好地理解和使用这两个概念,特别是在处理基本数据类型和引用数据类型的比较时。 ... [详细]
  • 本文详细介绍了PHP中的几种超全局变量,包括$GLOBAL、$_SERVER、$_POST、$_GET等,并探讨了AJAX的工作原理及其优缺点。通过具体示例,帮助读者更好地理解和应用这些技术。 ... [详细]
  • 使用 ModelAttribute 实现页面数据自动填充
    本文介绍了如何利用 Spring MVC 中的 ModelAttribute 注解,在页面跳转后自动填充表单数据。主要探讨了两种实现方法及其背后的原理。 ... [详细]
  • 使用REM和媒体查询实现响应式布局
    本文介绍如何利用REM单位和媒体查询(Media Queries)来创建适应不同屏幕尺寸的网页布局。通过具体示例,展示在不同屏幕宽度下如何调整页面元素的样式。 ... [详细]
  • Docker基础入门与环境配置指南
    本文介绍了Docker——一款用Go语言编写的开源应用程序容器引擎。通过Docker,用户能够将应用及其依赖打包进容器内,实现高效、轻量级的虚拟化。容器之间采用沙箱机制,确保彼此隔离且资源消耗低。 ... [详细]
  • 探索OpenWrt中的LuCI框架
    本文深入探讨了OpenWrt系统中轻量级HTTP服务器uhttpd的工作原理及其配置,重点介绍了LuCI界面的实现机制。 ... [详细]
  • LoadRunner中的IP欺骗配置与实践
    为了确保服务器能够有效地区分不同的用户请求,避免多人使用同一IP地址造成的访问限制,可以通过配置IP欺骗来解决这一问题。本文将详细介绍IP欺骗的工作原理及其在LoadRunner中的具体配置步骤。 ... [详细]
  • 本文概述了在GNU/Linux系统中,动态库在链接和运行阶段的搜索路径及其指定方法,包括通过编译时参数、环境变量及系统配置文件等方式来控制动态库的查找路径。 ... [详细]
  • 本文详细介绍了如何使用Rufus工具制作一个兼容UEFI启动模式的Windows Server 2008 R2安装U盘,包括必要的软件和步骤。 ... [详细]
  • 本文介绍如何使用 Python 计算两个时间戳之间的时间差,并将其转换为毫秒。示例代码展示了如何通过 `time` 和 `datetime` 模块实现这一功能。 ... [详细]
  • SPFA算法详解与应用
    当图中包含负权边时,传统的最短路径算法如Dijkstra不再适用,而Bellman-Ford算法虽然能解决问题,但其时间复杂度过高。SPFA算法作为一种改进的Bellman-Ford算法,能够在多数情况下提供更高效的解决方案。本文将详细介绍SPFA算法的原理、实现步骤及其应用场景。 ... [详细]
  • 本文详细对比了HashMap和HashTable在多线程环境下的安全性、对null值的支持、性能表现以及方法同步等方面的特点,帮助开发者根据具体需求选择合适的数据结构。 ... [详细]
  • 神策数据分析基础
    本文介绍了基于用户行为的数据分析方法,包括业务问题的提出与定义、具体行为的识别及统计分析流程。同时,详细阐述了如何利用事件模型(Event Model)来描述用户行为,以及在实际应用中的案例分析。 ... [详细]
  • 本文列举了构建和运行 Struts2 应用程序所需的核心 JAR 文件,包括文件上传、日志记录、模板引擎等关键组件。 ... [详细]
  • 开发笔记:每篇半小时1天入门MongoDB——3.MongoDB可视化及shell详解
    开发笔记:每篇半小时1天入门MongoDB——3.MongoDB可视化及shell详解 ... [详细]
author-avatar
漂亮女人群
这个家伙很懒,什么也没留下!
PHP1.CN | 中国最专业的PHP中文社区 | DevBox开发工具箱 | json解析格式化 |PHP资讯 | PHP教程 | 数据库技术 | 服务器技术 | 前端开发技术 | PHP框架 | 开发工具 | 在线工具
Copyright © 1998 - 2020 PHP1.CN. All Rights Reserved | 京公网安备 11010802041100号 | 京ICP备19059560号-4 | PHP1.CN 第一PHP社区 版权所有