Lots of conflicts in Pods project after using CocoaPods

I am just starting using CocoaPods to integrate some libraries to my project.
When I and my teammates both run pod install to install the new library everything seems fine. However, when I am pulling her code from our repository I got a huge amount of conflicts in Pods project. 535 to be exact.

enter image description here

  • Pod from github not working
  • How to use #import <> on a git submodule
  • Commit to git after switching to workspace and adding CocoaPods in Xcode?
  • Why is the project format with Xcode 5.1.1 from Plist to XML?
  • git clone over HTTPs timeout
  • How to have multiple pods in one git repo
  • enter image description here

    I do not think this is normal and I think it’s kinda crazy to choose mine or her manually. In fact I do not really know whose code I should keep.

    Any ideas on what to do with this? Any ideas on how to avoid this in the future?

  • How do I make git show diff when rewording a commit message during rebase -i?
  • Typical .gitignore file for an Android app
  • Mechanism behind packed files
  • Unable to see file in bare repository at server site after pushing from local machine
  • Git warning: push.default is unset; its implicit value is changing
  • Tortoisegit pull preserve timestamp
  • One Solution collect form web for “Lots of conflicts in Pods project after using CocoaPods”

    You shouldn’t be overly concerned about conflicts in your Pods project. The best you can do is to ensure that you are both using the same version of cocoapods as there is a world of difference between minor version. Once you have confirmed this, you can safely take her code and you should not have any further conflicts.

    The workspace, Pods directory and contents and also the Pods project file are all dynamically generated by cocoapods.

    It is routinely safe to remove your workspace file, pods project file and entire pods directory when you have pod issues. It is up to you whether you what to check them into your source control or not. in Particular the Pods directory. There are pros and cons of doing this. By checking everything, your app will build instantly from a pure checkout but as you are currently experiencing, but you cannot guarantee that a pod install with run successfully (if a reference pod becomes unavailable).

    I prefer to at least at /Pods to .gitignore as pod install should run from a CI server without fail.

    Use something like this template is always a good start.

    Git Baby is a git and github fan, let's start git clone.