当我执行git pull时我遇到了一些冲突,但我尝试使用mergetool修复此冲突(代码比较)我收到此错误:
我的.gitconfig配置是这样的:
[core]
autocrlf=false
[difftool "codecompare"]
cmd = 'C:\\Program Files\\Devart\\Code Compare\\codecompare.exe' -W \"$LOCAL\" \"$REMOTE\"
renames = true
[diff]
tool = codecompare
guitool = codecompare
[mergetool "codecompare"]
cmd = 'C:\\Program Files\\Devart\\Code Compare\\codemerge.exe' -MF=\"$LOCAL\" -TF=\"$REMOTE\" -BF=\"$BASE\" -RF=\"$MERGED\"
trustExitCode = true
[mergetool]
keepBackup = false
[merge]
tool = codecompare
guitool = codecompare
参数填充如下:
ARGUMENTS:
"-MF=./DBchanges/file change DB1.0_LOCAL_3972.sql"
"-TF=./DBchanges/file change DB1.0_REMOTE_3972.sql"
"-BF=./DBchanges/file change DB1.0_BASE_3972.sql"
"-RF=DBchanges/file change DB1.0.sql"
有人知道可能是什么原因吗?
谢谢大家