Help us understand the problem. What is going on with this article?

CocoaPodsで「Pull is not possible because you have unmerged files.」

More than 5 years have passed since last update.

なんて「pod install」した時に言われたら下記。

http://stackoverflow.com/questions/21534309/cocoapods-error-pull-is-not-possible-because-you-have-unmerged-files

$ pod repo remove master
$ pod setup

しろとのこと。

Why not register and get more from Qiita?
  1. We will deliver articles that match you
    By following users and tags, you can catch up information on technical fields that you are interested in as a whole
  2. you can read useful information later efficiently
    By "stocking" the articles you like, you can search right away
Comments
Sign up for free and join this conversation.
If you already have a Qiita account
Why do not you register as a user and use Qiita more conveniently?
You need to log in to use this function. Qiita can be used more conveniently after logging in.
You seem to be reading articles frequently this month. Qiita can be used more conveniently after logging in.
  1. We will deliver articles that match you
    By following users and tags, you can catch up information on technical fields that you are interested in as a whole
  2. you can read useful information later efficiently
    By "stocking" the articles you like, you can search right away