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

起因及现象：

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

[!] Pod::Executable pullAuto-merging geos/3.4.2/geos.podspecCONFLICT (add/add): Merge conflict in geos/3.4.2/geos.podspecAuto-merging Typhoon/1.6.6/Typhoon.podspecCONFLICT (add/add): Merge conflict in Typhoon/1.6.6/Typhoon.podspecAuto-merging Typhoon/1.6.5/Typhoon.podspecCONFLICT (add/add): Merge conflict in Typhoon/1.6.5/Typhoon.podspecAuto-merging Typhoon/1.6.3/Typhoon.podspecCONFLICT (add/add): Merge conflict in Typhoon/1.6.3/Typhoon.podspecAuto-merging Typhoon/1.6.2/Typhoon.podspecCONFLICT (add/add): Merge conflict in Typhoon/1.6.2/Typhoon.podspecAuto-merging Typhoon/1.6.1/Typhoon.podspecCONFLICT (add/add): Merge conflict in Typhoon/1.6.1/Typhoon.podspecAuto-merging Typhoon/1.6.0/Typhoon.podspecCONFLICT (add/add): Merge conflict in Typhoon/1.6.0/Typhoon.podspecAuto-merging Typhoon/1.5.9/Typhoon.podspecCONFLICT (add/add): Merge conflict in Typhoon/1.5.9/Typhoon.podspecAuto-merging Typhoon/1.5.8/Typhoon.podspecCONFLICT (add/add): Merge conflict in Typhoon/1.5.8/Typhoon.podspecAuto-merging Typhoon/1.5.7/Typhoon.podspecCONFLICT (add/add): Merge conflict in Typhoon/1.5.7/Typhoon.podspecAuto-merging Typhoon/1.5.6/Typhoon.podspecCONFLICT (add/add): Merge conflict in Typhoon/1.5.6/Typhoon.podspecAuto-merging Typhoon/1.5.5/Typhoon.podspecCONFLICT (add/add): Merge conflict in Typhoon/1.5.5/Typhoon.podspecAuto-merging Typhoon/1.5.4/Typhoon.podspecCONFLICT (add/add): Merge conflict in Typhoon/1.5.4/Typhoon.podspecAuto-merging Typhoon/1.5.3/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.5.3/Typhoon.podspecAuto-merging Typhoon/1.5.2/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.5.2/Typhoon.podspecAuto-merging Typhoon/1.5.1/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.5.1/Typhoon.podspecAuto-merging Typhoon/1.5.0/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.5.0/Typhoon.podspecAuto-merging Typhoon/1.3.8/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.3.8/Typhoon.podspecAuto-merging Typhoon/1.3.7/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.3.7/Typhoon.podspecAuto-merging Typhoon/1.3.6/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.3.6/Typhoon.podspecAuto-merging Typhoon/1.3.5/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.3.5/Typhoon.podspecAuto-merging Typhoon/1.3.4/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.3.4/Typhoon.podspecAuto-merging Typhoon/1.3.3/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.3.3/Typhoon.podspecAuto-merging Typhoon/1.3.2/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.3.2/Typhoon.podspecAuto-merging Typhoon/1.3.1/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.3.1/Typhoon.podspecAuto-merging Typhoon/1.3.0/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.3.0/Typhoon.podspecAuto-merging Typhoon/1.2.9/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.2.9/Typhoon.podspecAuto-merging Typhoon/1.2.8/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.2.8/Typhoon.podspecAuto-merging Typhoon/1.2.7/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.2.7/Typhoon.podspecAuto-merging Typhoon/1.2.6/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.2.6/Typhoon.podspecAuto-merging Typhoon/1.2.5/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.2.5/Typhoon.podspecAuto-merging Typhoon/1.2.4/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.2.4/Typhoon.podspecAuto-merging Typhoon/1.2.3/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.2.3/Typhoon.podspecAuto-merging Typhoon/1.2.2/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.2.2/Typhoon.podspecAuto-merging Typhoon/1.2.1/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.2.1/Typhoon.podspecAuto-merging Typhoon/1.2.0/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.2.0/Typhoon.podspecAuto-merging Typhoon/1.1.9/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.1.9/Typhoon.podspecAuto-merging Typhoon/1.1.8/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.1.8/Typhoon.podspecAuto-merging Typhoon/1.1.7/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.1.7/Typhoon.podspecAuto-merging Typhoon/1.1.6/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.1.6/Typhoon.podspecAuto-merging Typhoon/1.1.5/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.1.5/Typhoon.podspecAuto-merging Typhoon/1.1.4/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.1.4/Typhoon.podspecAuto-merging Typhoon/1.1.3/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.1.3/Typhoon.podspecAuto-merging Typhoon/1.1.2/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.1.2/Typhoon.podspecAuto-merging Typhoon/1.1.10/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.1.10/Typhoon.podspecAuto-merging Typhoon/1.1.1/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.1.1/Typhoon.podspecAuto-merging Typhoon/1.1.0/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.1.0/Typhoon.podspecAuto-merging Typhoon/1.0.9/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.0.9/Typhoon.podspecAuto-merging Typhoon/1.0.8/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.0.8/Typhoon.podspecAuto-merging Typhoon/1.0.7/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.0.7/Typhoon.podspecAuto-merging Typhoon/1.0.6/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.0.6/Typhoon.podspecAuto-merging Typhoon/1.0.5/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.0.5/Typhoon.podspecAuto-merging Typhoon/1.0.4/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.0.4/Typhoon.podspecAuto-merging Typhoon/1.0.3/Typhoon.podspecCONFLICT (content): Merge conflict in Typhoon/1.0.3/Typhoon.podspecAuto-merging SupportKit/1.0/SupportKit.podspecCONFLICT (add/add): Merge conflict in SupportKit/1.0/SupportKit.podspecAuto-merging SBJson4/4.0.0/SBJson4.podspecCONFLICT (add/add): Merge conflict in SBJson4/4.0.0/SBJson4.podspecAuto-merging SBJson/4.0.0/SBJson.podspecCONFLICT (add/add): Merge conflict in SBJson/4.0.0/SBJson.podspecAuto-merging RegExCategories/1.0/RegExCategories.podspecCONFLICT (add/add): Merge conflict in RegExCategories/1.0/RegExCategories.podspecAuto-merging Raygun4iOS/1.1.1/Raygun4iOS.podspecCONFLICT (add/add): Merge conflict in Raygun4iOS/1.1.1/Raygun4iOS.podspecAuto-merging ProximityKit/0.2.3/ProximityKit.podspecCONFLICT (add/add): Merge conflict in ProximityKit/0.2.3/ProximityKit.podspecAuto-merging Pixate/2.0.1/Pixate.podspecCONFLICT (add/add): Merge conflict in Pixate/2.0.1/Pixate.podspecAuto-merging OctoKit/0.4/OctoKit.podspecCONFLICT (add/add): Merge conflict in OctoKit/0.4/OctoKit.podspecAuto-merging ObjectiveSugar/1.1.0/ObjectiveSugar.podspecCONFLICT (add/add): Merge conflict in ObjectiveSugar/1.1.0/ObjectiveSugar.podspecAuto-merging ObjectiveSugar/1.0.0/ObjectiveSugar.podspecCONFLICT (add/add): Merge conflict in ObjectiveSugar/1.0.0/ObjectiveSugar.podspecAuto-merging NSString+TBEncryption/1.0/NSString+TBEncryption.podspecCONFLICT (add/add): Merge conflict in NSString+TBEncryption/1.0/NSString+TBEncryption.podspecAuto-merging NRTouchPoints/0.1.0/NRTouchPoints.podspecCONFLICT (add/add): Merge conflict in NRTouchPoints/0.1.0/NRTouchPoints.podspecAuto-merging MagicPie/1.0.0/MagicPie.podspecCONFLICT (add/add): Merge conflict in MagicPie/1.0.0/MagicPie.podspecAuto-merging LetsMove/1.9/LetsMove.podspecCONFLICT (add/add): Merge conflict in LetsMove/1.9/LetsMove.podspecAuto-merging KEZCollectionViewTableLayout/1.0/KEZCollectionViewTableLayout.podspecCONFLICT (add/add): Merge conflict in KEZCollectionViewTableLayout/1.0/KEZCollectionViewTableLayout.podspecAuto-merging JavaScriptCoreOpalAdditions/0.3.1/JavaScriptCoreOpalAdditions.podspecCONFLICT (add/add): Merge conflict in JavaScriptCoreOpalAdditions/0.3.1/JavaScriptCoreOpalAdditions.podspecAuto-merging JavaScriptCoreOpalAdditions/0.3.0/JavaScriptCoreOpalAdditions.podspecCONFLICT (add/add): Merge conflict in JavaScriptCoreOpalAdditions/0.3.0/JavaScriptCoreOpalAdditions.podspecAuto-merging JavaScriptCoreOpalAdditions/0.2.4/JavaScriptCoreOpalAdditions.podspecCONFLICT (add/add): Merge conflict in JavaScriptCoreOpalAdditions/0.2.4/JavaScriptCoreOpalAdditions.podspecAuto-merging JavaScriptCoreOpalAdditions/0.2.3/JavaScriptCoreOpalAdditions.podspecCONFLICT (add/add): Merge conflict in JavaScriptCoreOpalAdditions/0.2.3/JavaScriptCoreOpalAdditions.podspecAuto-merging JavaScriptCoreOpalAdditions/0.2.2/JavaScriptCoreOpalAdditions.podspecCONFLICT (add/add): Merge conflict in JavaScriptCoreOpalAdditions/0.2.2/JavaScriptCoreOpalAdditions.podspecAuto-merging JavaScriptCoreOpalAdditions/0.2.1/JavaScriptCoreOpalAdditions.podspecCONFLICT (add/add): Merge conflict in JavaScriptCoreOpalAdditions/0.2.1/JavaScriptCoreOpalAdditions.podspecAuto-merging JavaScriptCoreOpalAdditions/0.2.0/JavaScriptCoreOpalAdditions.podspecCONFLICT (add/add): Merge conflict in JavaScriptCoreOpalAdditions/0.2.0/JavaScriptCoreOpalAdditions.podspecAuto-merging JavaScriptCoreOpalAdditions/0.1.0/JavaScriptCoreOpalAdditions.podspecCONFLICT (add/add): Merge conflict in JavaScriptCoreOpalAdditions/0.1.0/JavaScriptCoreOpalAdditions.podspecAuto-merging JPSDisplayLink/0.0.1/JPSDisplayLink.podspecCONFLICT (add/add): Merge conflict in JPSDisplayLink/0.0.1/JPSDisplayLink.podspecAdding ILTranslucentView/0.0.1/ILTranslucentView.podspecCONFLICT (file/directory): There is a directory with name ILTranslucentView in af97e1583ad2580daed0287d2312797cf4fd7427. Adding ILTranslucentView as ILTranslucentView~HEADAuto-merging IGJavaScriptConsole/0.1.1/IGJavaScriptConsole.podspecCONFLICT (add/add): Merge conflict in IGJavaScriptConsole/0.1.1/IGJavaScriptConsole.podspecAuto-merging HockeySDK-Mac/2.0.0/HockeySDK-Mac.podspecCONFLICT (add/add): Merge conflict in HockeySDK-Mac/2.0.0/HockeySDK-Mac.podspecRemoving HeapAnalytics/0.0.1/HeapAnalytics.podspecAuto-merging GeotriggerSDK/0.2.1/GeotriggerSDK.podspecCONFLICT (add/add): Merge conflict in GeotriggerSDK/0.2.1/GeotriggerSDK.podspecAuto-merging GeotriggerSDK/0.2.0/GeotriggerSDK.podspecCONFLICT (add/add): Merge conflict in GeotriggerSDK/0.2.0/GeotriggerSDK.podspecAuto-merging GeotriggerSDK/0.1.2/GeotriggerSDK.podspecCONFLICT (add/add): Merge conflict in GeotriggerSDK/0.1.2/GeotriggerSDK.podspecAuto-merging GeotriggerSDK/0.1.1/GeotriggerSDK.podspecCONFLICT (add/add): Merge conflict in GeotriggerSDK/0.1.1/GeotriggerSDK.podspecAuto-merging GeotriggerSDK/0.1.0/GeotriggerSDK.podspecCONFLICT (add/add): Merge conflict in GeotriggerSDK/0.1.0/GeotriggerSDK.podspecAuto-merging GBDeviceInfo/2.2.5/GBDeviceInfo.podspecCONFLICT (add/add): Merge conflict in GBDeviceInfo/2.2.5/GBDeviceInfo.podspecRemoving DZCategories/1.0.2/DZCategories.podspecAuto-merging DFPickerView/0.0.1/DFPickerView.podspecCONFLICT (add/add): Merge conflict in DFPickerView/0.0.1/DFPickerView.podspecAuto-merging DBChooser/1.1/DBChooser.podspecCONFLICT (add/add): Merge conflict in DBChooser/1.1/DBChooser.podspecAdding Countly/2.0.0/Countly.podspecCONFLICT (file/directory): There is a directory with name Countly/2.0.0 in af97e1583ad2580daed0287d2312797cf4fd7427. Adding Countly/2.0.0 as Countly/2.0.0~HEADCONFLICT (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.podspecCONFLICT (add/add): Merge conflict in CocoaSPDY/1.0.0/CocoaSPDY.podspecCONFLICT (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 HEADRenaming 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 insteadCONFLICT (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.podspecCONFLICT (add/add): Merge conflict in BlockRSSParser/2.1/BlockRSSParser.podspecAuto-merging .travis.ymlCONFLICT (content): Merge conflict in .travis.ymlAutomatic 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/mastergit reset --hard origin/master

参考网址：

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

官方说明：

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