Warning: file_get_contents(/data/phpspider/zhask/data//catemap/0/performance/5.json): failed to open stream: No such file or directory in /data/phpspider/zhask/libs/function.php on line 167

Warning: Invalid argument supplied for foreach() in /data/phpspider/zhask/libs/tag.function.php on line 1116

Notice: Undefined index: in /data/phpspider/zhask/libs/function.php on line 180

Warning: array_chunk() expects parameter 1 to be array, null given in /data/phpspider/zhask/libs/function.php on line 181
Windows GitMergeTool异常_Windows_Git_Merge_Mergetool - Fatal编程技术网

Windows GitMergeTool异常

Windows GitMergeTool异常,windows,git,merge,mergetool,Windows,Git,Merge,Mergetool,我正在尝试为windows配置meld。 刚才我添加了python变量环境,步骤如下: git config --global merge.tool meld git config --global mergetool.meld.path /c/Users/andarno/Downloads/meld-1.5.2/bin/meld 但当我尝试合并更改时,会显示以下消息: Normal merge conflict for 'folder/script.js': {local}: modif

我正在尝试为windows配置meld。 刚才我添加了python变量环境,步骤如下:

git config --global merge.tool meld
git config --global mergetool.meld.path /c/Users/andarno/Downloads/meld-1.5.2/bin/meld
但当我尝试合并更改时,会显示以下消息:

Normal merge conflict for 'folder/script.js':
  {local}: modified file
  {remote}: modified file
Hit return to start merge resolution tool (meld):
Traceback (most recent call last):
  File "c:/Users/ben/Desktop/Meld/meld/bin/meld", line 98, in <module>
    libintl = cdll.intl
  File "c:\Python27\lib\ctypes\__init__.py", line 435, in __getattr__
    dll = self._dlltype(name)
  File "c:\Python27\lib\ctypes\__init__.py", line 365, in __init__
    self._handle = _dlopen(self._name, mode)
WindowsError: [Error 126] The specified module could not be found
folder/script.js seems unchanged.
“folder/script.js”的正常合并冲突: {local}:已修改的文件 {remote}:已修改的文件 点击返回开始合并解析工具(meld): 回溯(最近一次呼叫最后一次): 文件“c:/Users/ben/Desktop/Meld/Meld/bin/Meld”,第98行,在 libintl=cdll.intl 文件“c:\Python27\lib\ctypes\\ uuuu init\uuuuu.py”,第435行,在\uuu getattr中__ dll=self.\u dlltype(名称) 文件“c:\Python27\lib\ctypes\\uuuu init\uuuu.py”,第365行,在\uuu init中__ self.\u handle=\u dlopen(self.\u名称,模式) WindowsError:[错误126]找不到指定的模块 文件夹/script.js似乎没有改变。
我不确定错误的原因,有人有想法吗?

这个问题是仅仅使用meld作为合并工具造成的,还是如果您使用其他程序(如kdiff3)也会发生?只有使用meld,kidiff3才能正常工作。可能是Python的问题,如果从cmd.exe命令提示符手动运行
c:\Users\ben\Desktop\Meld\Meld\bin\Meld
,则不会出现上述错误?是的,使用cmd和git mergetoolm,但总是相同的错误。我将尝试更新python