如果根据给出的信息无法调试，请道歉，但我现在真的摸不着头脑。
前一段时间我做了合并，现在注意到有些文件中包含let callStateChanged: LinphoneCoreCallStateChangedCb = {
(lc: Optional<OpaquePointer>, call: Optional<OpaquePointer>, callSate: LinphoneCallState, message: Optional<UnsafePointer<Int8>>) in
switch callSate{
case LinphoneCallIncomingReceived: /**<This is a new incoming call */
NSLog("callStateChanged: LinphoneCallIncomingReceived")
if answerCall{
ms_usleep(3 * 1000 * 1000); // Wait 3 seconds to pickup
linphone_core_accept_call(lc, call)
}
case LinphoneCallStreamsRunning: /**<The media streams are established and running*/
NSLog("callStateChanged: LinphoneCallStreamsRunning")
case LinphoneCallError: /**<The call encountered an error*/
NSLog("callStateChanged: LinphoneCallError")
default:
NSLog("Default call state")
}
}
，如下所示。
<<<<<<< HEAD我知道这些是冲突标记，并且很乐意手动解决这些冲突，但不知道当我输入 <script>
function() {
.
.
.
<<<<<<< HEAD
</script>
<script>
.
.
.
return false;
}
=======
>>>>>>> master
时我可能会受到影响的所有文件
git status On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working tree clean
收益
git mergetool最终说This message is displayed because 'merge.tool' is not configured.
See 'git mergetool --tool-help' or 'git help config' for more details.
'git mergetool' will now attempt to use one of the following tools:
opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge ecmerge p4merge araxis bc codecompare emerge vimdiff
No files need merging
。
我还能检查什么？
答案 0 :(得分：2)
有人提交了带有冲突标记的文件。你可以：
git grep '<<<<'查找包含这些行的文件，然后手动修复这些文件。
git blame在他们身上找到谁提交了这些行，并确保他们知道他们应该先解决提交，然后将该文件标记为已解决。