Question

使用融合时遇到了问题。

我按照以下链接在Mac上设置融合：https://yousseb.github.io/meld/

我用Mojave安装了Meld，并在.gitconfig中添加了以下几行：

  tool = meld
[difftool]
  prompt = false
[difftool "meld"]
  trustExitCode = true
  cmd = open -W -a Meld --args \"$LOCAL\" \"$REMOTE\"
[merge]
  tool = meld
[mergetool]
  prompt = false
[mergetool "meld"]
  trustExitCode = true
  cmd = open -W -a Meld --args --auto-merge \"$LOCAL\" \"$BASE\" \"$REMOTE\" --output=\"$MERGED\"

但是，它对我不起作用。当我运行“ git difftool”时，它显示以下信息：

diff --cc SampleApp/src/CMakeLists.txt
index 13ed9c4,d7df22e..0000000
--- a/SampleApp/src/CMakeLists.txt
+++ b/SampleApp/src/CMakeLists.txt
@@@ -35,11 -34,11 +35,17 @@@ ENDIF(
  add_executable(SampleApp ${SampleApp_SOURCES})

  target_include_directories(SampleApp PUBLIC
-     "${A_INCLUDE_DIRS}"
+     "${BInterface_SOURCE_DIR}/include"
      "${a_SOURCE_DIR}/include"
++<<<<<<< HEAD
 +    "${B_SOURCE_DIR}/include"
 +    "${ww_SOURCE_DIR}/include"
 +    "${xyz_INCLUDE_DIR}")
++=======
+     "${z_INCLUDE_DIR}"
+     "${Dependencies_Headers}"
+     "${b_INCLUDE_DIRS}")
++>>>>>>> 73d8100... add and modify files

  target_link_libraries(TestApp
      "${b_LDFLAGS}"
error: diff died of signal 11

然后，我在网上搜索解决方案，但仍然对我不起作用。此链接：https://github.com/yousseb/meld/issues/70

cd ${HOME}
rm -rf ./.local/share/meld
rm -f ./Library/Preferences/org.gnome.meld.plist
rm -rf "./Library/Saved Application State/org.gnome.meld.savedState/"

发生错误：git difftool在Mac上的设置中不起作用

0 个答案: