git rebase

1.

 

回落到基础版本上打补丁及进行三方合并...

自动合并 iOS/sdk/AnyChat_NewSDK_Component/sdk/AnyChatModelSDK/AnyChatModelSDK/AnyChatModelSDK.m

冲突（内容）：合并冲突于 iOS/sdk/AnyChat_NewSDK_Component/sdk/AnyChatModelSDK/AnyChatModelSDK/AnyChatModelSDK.m

自动合并 iOS/sdk/AnyChat_NewSDK_Component/sdk/AnyChatModelSDK/AnyChatModelSDK/AnyChatModelSDK.h

冲突（内容）：合并冲突于 iOS/sdk/AnyChat_NewSDK_Component/sdk/AnyChatModelSDK/AnyChatModelSDK/AnyChatModelSDK.h

自动合并 iOS/sdk/AnyChat_NewSDK_Component/sdk/AnyChatModelSDK/AnyChatModelSDK.xcodeproj/project.pbxproj

冲突（内容）：合并冲突于 iOS/sdk/AnyChat_NewSDK_Component/sdk/AnyChatModelSDK/AnyChatModelSDK.xcodeproj/project.pbxproj

error: 无法合并变更。

打补丁失败于 0001 add AnyChatFileDownloadTask,  AnyChatFileManagerModel, AnyChatTransferModel

提示：用 'git am --show-current-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".