pod 文件冲突

最新推荐文章于 2025-06-09 15:24:44 发布

weixin_34409822

最新推荐文章于 2025-06-09 15:24:44 发布

阅读量958

点赞数

CC 4.0 BY-SA版权

文章标签： python cocoapods

原文链接：https://my.oschina.net/u/2601834/blog/917096

2019独角兽企业重金招聘Python工程师标准>>>

[!] ERROR: Parsing unable to continue due to merge conflicts present in:

the file located at /Users/zhaodong/JTD/crm/Pods/Manifest.lock

PODS:

- AFNetworking (3.0.4):

- AFNetworking/NSURLSession (= 3.0.4)

- AFNetworking/Reachability (= 3.0.4)

- AFNetworking/Security (= 3.0.4)

- AFNetworking/Serialization (= 3.0.4)

- AFNetworking/UIKit (= 3.0.4)

- AFNetworking/NSURLSession (3.0.4):

- AFNetworking/Reachability

- AFNetworking/Security

- AFNetworking/Serialization

- AFNetworking/Reachability (3.0.4)

- AFNetworking/Security (3.0.4)

- AFNetworking/Serialization (3.0.4)

- AFNetworking/UIKit (3.0.4):

- AFNetworking/NSURLSession

- AliyunOSSiOS (2.6.0)

- AMap2DMap (4.6.0):

- AMapFoundation (~> 1.3)

- AMapFoundation (1.4.0)

- AMapLocation (2.4.0):

- AMapFoundation (~> 1.4)

- BaiduMapKit (3.0.0)

- CTAssetsPickerController (2.9.5)

- FMDB (2.6.2):

- FMDB/standard (= 2.6.2)

- FMDB/standard (2.6.2)

- GPUImage (0.1.7)

- IQKeyboardManager (3.3.7)

- Masonry (0.6.4)

- MBProgressHUD (0.9.2)

- MJExtension (3.0.13)

- MJRefresh (3.0.8)

- pop (1.0.9)

- Reachability (3.2)

- SDCycleScrollView (1.65):

- SDWebImage (~> 3.7)

- SDWebImage (3.7.6):

- SDWebImage/Core (= 3.7.6)

- SDWebImage/Core (3.7.6)

- YYModel (1.0.4)

DEPENDENCIES:

- AFNetworking (~> 3.0.4)

- AliyunOSSiOS

- AMap2DMap

- AMapLocation

- BaiduMapKit (~> 3.0.0)

- CTAssetsPickerController

- FMDB

- GPUImage (~> 0.1.7)

- IQKeyboardManager

- Masonry (~> 0.6.3)

- MBProgressHUD (~> 0.9.2)

- MJExtension (~> 3.0.3)

- MJRefresh (~> 3.0.1)

- pop (~> 1.0.9)

- Reachability (~> 3.2)

- SDCycleScrollView (~> 1.3)

- SDWebImage/Core (~> 3.7.3)

- YYModel

SPEC CHECKSUMS:

AFNetworking: a0075feb321559dc78d9d85b55d11caa19eabb93

AliyunOSSiOS: 058b038cc82000dadb8f8e3893a97243124f2898

AMap2DMap: 003fa70526983a1469ae6fc3323a6ee8b5ccf53c

AMapFoundation: 458974f46a39df8407fd818ab83d2630d494c726

AMapLocation: 47b62b5381a66e4d0c2931b70ffde72682427896

BaiduMapKit: de2a726d5296d6b2dc0e974b683af73153608dcd

CTAssetsPickerController: b413fece2194ae3dbf22fbc544cf6f2a6d516a4d

FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a

GPUImage: 733a5f0fab92df9de1c37ba9df520a833ccb406d

IQKeyboardManager: 249c3946acf61345c18b038eb50863fe2793e3a8

Masonry: 281802d04d787ea2973179ee8bcb50500579ede2

MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1

MJExtension: 5932755f451458eefa24239358817f8d291240c7

MJRefresh: fafde8f18f4afd66b434331a9beb67a6c0264056

pop: f667631a5108a2e60d9e8797c9b32ddaf2080bce

Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96

SDCycleScrollView: f72904c77698a7f93a41bcbbc2d78b073bf7326c

SDWebImage: c325cf02c30337336b95beff20a13df489ec0ec9

YYModel: 2a7fdd96aaa4b86a824e26d0c517de8928c04b30

<<<<<<< HEAD

PODFILE CHECKSUM: 33cb213c2834d904e2f6772f61aaef548107f086

=======

PODFILE CHECKSUM: 6bf103a5914682bd5ba8bae807e68d1cef518f0f

>>>>>>> CRM_1.0_ZYD

COCOAPODS: 1.2.1

[!] Smart quotes were detected and ignored in your Podfile. To avoid issues in the future, you should not use TextEdit for editing it. If you are not using TextEdit, you should turn off smart quotes in your editor of choice.

[!] `<PBXSourcesBuildPhase UUID=`3741C5D01EC18B530090C619`>` attempted to initialize an object with an unknown UUID. `A156E4DD1EDE927800063C97` for attribute: `files`. This can be the result of a merge and the unknown UUID is being discarded.

解决方案：

关闭现在的工作空间，删掉以前的xcworkspace，然后重新pod install，install完后，重新打开项目，clean＋build项目，运行

[plain] view plain copy