Howdy, iam Damon Welch, Don’t worry, it’s one day closer to the weekend.
How Do I Resolve Podfile Lock Merge Conflict? [Solved]
Simply run pod install (or bundle exec pod install if using bundler) to reinstall all the project’s pods. This will regenerate the deleted Pods/ folder and create the correct checksum in Podfile. lock . That’s it — you’ve now got both your changes merged, and you’ve fixed the merge conflict (at least, for the pods!).21 Feb 2018
Resolving Merge Conflicts in React-Native
Resolving Merge Conflicts
Everything you need to know about Cocoapods | Swift | Xcode | iOS
This video explains everything about
Building Clubhouse: Reviewing App Structure w/ Archetapp
In this stream, Kilo and Archetapp (Jared Davidson) will be going over app architecture decisions.
