深夜加班,准备把一个多月没用的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这种问题原理很简单,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/