terminal readout

gistfile1.txt

LM-SJN-21004935:consumer-blank-ios slydon$ git pull upstream develop --rebase
remote: Counting objects: 6388, done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 6388 (delta 3638), reused 3639 (delta 3637), pack-reused 2743
Receiving objects: 100% (6388/6388), 7.98 MiB | 4.46 MiB/s, done.
Resolving deltas: 100% (4828/4828), completed with 827 local objects.
From https://github.blank.com/IOS-R/consumer-blank-ios
 * branch                  develop    -> FETCH_HEAD
   f7c8e8d86a..75b1fa983e  develop    -> upstream/develop
First, rewinding head to replay your work on top of it...
Applying: After clearing the mess of pods and successfully running the app I am commiting.
Using index info to reconstruct a base tree...
M	Podfile.lock
M	consumerblank.xcodeproj/project.pbxproj
Falling back to patching base and 3-way merge...
Auto-merging consumerblank.xcodeproj/project.pbxproj
CONFLICT (content): Merge conflict in consumerblank.xcodeproj/project.pbxproj
Auto-merging Podfile.lock
CONFLICT (content): Merge conflict in Podfile.lock
error: Failed to merge in the changes.
Patch failed at 0001 After clearing the mess of pods and successfully running the app I am commiting.
The copy of the patch that failed is found in: .git/rebase-apply/patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".