iOS cocoaPods <<<<<<< HEAD PODFI

2020-01-13  本文已影响0人  奔跑吧小蚂蚁

问题

[!] ERROR: Parsing unable to continue due to merge conflicts present in:
the file located at /Users/wangming/Desktop/未命名文件夹 2/来拜-APP/Podfile.lock
PODS:
  - AFNetworking (3.1.0):
    - AFNetworking/NSURLSession (= 3.1.0)
    - AFNetworking/Reachability (= 3.1.0)
    - AFNetworking/Security (= 3.1.0)
    - AFNetworking/Serialization (= 3.1.0)
    - AFNetworking/UIKit (= 3.1.0)
  - AFNetworking/NSURLSession (3.1.0):
    - AFNetworking/Reachability
    - AFNetworking/Security
    - AFNetworking/Serialization
  - AFNetworking/Reachability (3.1.0)
  - AFNetworking/Security (3.1.0)
  - AFNetworking/Serialization (3.1.0)
  - AFNetworking/UIKit (3.1.0):
    - AFNetworking/NSURLSession
  - Bugly (2.5.2)
  - Colours (5.13.0):
    - Colours/ObjC (= 5.13.0)
  - Colours/ObjC (5.13.0)
  - FLAnimatedImage (1.0.12)
  - Hyphenate (3.5.5)
  - IQKeyboardManager (6.0.3)
  - Masonry (1.1.0)
  - MBProgressHUD (1.1.0)
  - MJExtension (3.0.17)
  - MJRefresh (3.1.15.7)
  - SDWebImage (4.4.0):
    - SDWebImage/Core (= 4.4.0)
  - SDWebImage/Core (4.4.0)
  - SDWebImage/GIF (4.4.0):
    - FLAnimatedImage (~> 1.0)
    - SDWebImage/Core
  - TZImagePickerController (3.2.9)
  - YYText (1.0.7)

DEPENDENCIES:
  - AFNetworking (~> 3.1.0)
  - Bugly
  - Colours (= 5.13.0)
  - FLAnimatedImage (~> 1.0)
  - Hyphenate
  - IQKeyboardManager (= 6.0.3)
  - Masonry (~> 1.1.0)
  - MBProgressHUD (~> 1.1.0)
  - MJExtension (~> 3.0.13)
  - MJRefresh (~> 3.1.15.3)
  - SDWebImage (= 4.4.0)
  - SDWebImage/GIF
  - TZImagePickerController (~> 3.2.9)
  - YYText (= 1.0.7)

SPEC REPOS:
  https://github.com/CocoaPods/Specs.git:
    - AFNetworking
    - Bugly
    - Colours
    - FLAnimatedImage
    - Hyphenate
    - IQKeyboardManager
    - Masonry
    - MBProgressHUD
    - MJExtension
    - MJRefresh
    - SDWebImage
    - TZImagePickerController
    - YYText

SPEC CHECKSUMS:
  AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
  Bugly: dbac48b55ad469a97cc4321045cd50df8f63d44f
  Colours: f24220c38f13deac88612667e9b4a7fb96b871d4
  FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31
  Hyphenate: 396b936de5b3d68ec266c4bb9078e3ec95a45f31
  IQKeyboardManager: c390e612f4b98c8fd748016470138537dc163ead
  Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
  MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
  MJExtension: 74ec83124a68891619fb7ba9c5c811bbf1691076
  MJRefresh: 697f8ec75ebdbe9207767bb682cf0f51b0d8a41f
  SDWebImage: b534502786e43dde36dfcaee89356fe6df30e203
  TZImagePickerController: 1f92968aa0e98a06b9e2eccca8560acc19254257
  YYText: 5c461d709e24d55a182d1441c41dc639a18a4849

<<<<<<< HEAD
PODFILE CHECKSUM: aa6fae79755124cf8cfab3933ef77ae83ef5da84
=======
PODFILE CHECKSUM: ac56ee5b70a8399c878f923c54a10f982cea536e
>>>>>>> 5f2555898baf5bd351a97ed61725c6cf7ad0433e

COCOAPODS: 1.8.4

解决方法

删除Pod以及相关 重新pod install

上一篇下一篇

猜你喜欢

热点阅读