search

dji-sdk / Mobile-UXSDK-iOS

DJI Mobile UXSDK is a suite of product agnostic UI objects that fast tracks the development of iOS applications using the DJI Mobile SDK.
Other
73 stars 43 forks source link

Invalid `Podfile` file: syntax error, unexpected << (aka merge with issues) #74

Closed vvahans closed 3 years ago

vvahans commented 4 years ago

After this merge pod install in Mobile-UXSDK-iOS/Sample Code/SwiftSampleCode fails with

[!] Invalid Podfile file: syntax error, unexpected <<, expecting end <<<<<<< HEAD ^~ /Mobile-UXSDK-iOS/Sample Code/SwiftSampleCode/Podfile:11: syntax error, unexpected end, expecting end-of-input.

from /Mobile-UXSDK-iOS/Sample Code/SwiftSampleCode/Podfile:5

-------------------------------------------

use_frameworks!

<<<<<<< HEAD

pod 'DJI-SDK-iOS', '~> 4.11.1'

-------------------------------------------

File to fix: https://github.com/dji-sdk/Mobile-UXSDK-iOS/blob/master/Sample%20Code/SwiftSampleCode/Podfile

dji-dev commented 4 years ago

Public comment from Lisa Fedane in Zendesk ticket #31951:

Thanks for bringing this to our attention - I am escalated this to our engineers now.

Lisa Fedane DJI Developer Support

dji-dev commented 3 years ago

Agent comment from Hummels Lei in Zendesk ticket #31951:

Hi. I want to know if the problem in this ticket has been solved. For now, we have released the latest 4.14 iOS SDK, you can upgrade to the latest SDK to test again. If the problem persists, please post it on our new forum https://djisdksupport.zendesk.com/hc/en-us/community/topics. We will solve it for you through the forum.

°°°