1

My partner and I are using git to share our Xcode project. We accidentally added the same cocoapod and when I pulled from GitHub my project now won't open.

The merge error is in the podfile.lock but I can't figure out how to access that to fix it.
I've tried everything I can find on the internet which led me to the podfile.lock but I can't figure out where to go from here.

VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
Ethan Hardacre
  • 125
  • 2
  • 12

1 Answers1

0

Generally, the error message is about

error: The sandbox is not in sync with the Podfile.lock
Run 'pod install' or update your CocoaPods installation

The usual workaround is to delete to Pod from the project, but here, the goal is to keep it, so, as the OP Ethan Hardacre comments:

the only solution to this problem that I could find was deleting the project and redownloading from GitHub.

In other words, keep the one that was pushed first to GitHub.

VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250