Warning: file_get_contents(/data/phpspider/zhask/data//catemap/9/git/23.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
文件合并与git-It';一切都大错特错了_Git_Filemerge - Fatal编程技术网

文件合并与git-It';一切都大错特错了

文件合并与git-It';一切都大错特错了,git,filemerge,Git,Filemerge,按照这封信,每当我现在运行diff时,我都会得到以下信息: ~~$ git diff fatal: cannot exec '/Users/john/git-diff-cmd.sh': Permission denied external diff died, stopping at footer.php. 这显然是不可取的!!如何修复它,以及如何让Filemerge和GIT更好地发挥作用?看起来您没有脚本文件的执行权限。转到终端并键入 chmod a+x /Users/john/git-di

按照这封信,每当我现在运行diff时,我都会得到以下信息:

~~$ git diff
fatal: cannot exec '/Users/john/git-diff-cmd.sh': Permission denied
external diff died, stopping at footer.php.

这显然是不可取的!!如何修复它,以及如何让Filemerge和GIT更好地发挥作用?

看起来您没有脚本文件的执行权限。转到终端并键入

chmod a+x /Users/john/git-diff-cmd.sh

然后再次尝试运行git。

您的脚本必须是可执行的:

chmod u+x '/Users/john/git-diff-cmd.sh'

不过,用户可执行文件应该足够了