git - 将KDiff3设置为默认的mergetool [英] git - set KDiff3 as default mergetool

问题描述

安装 KDiff3 来管理 git 中的冲突后，仍默认为我打开：

这里是答案：

  git config  - -global --add merge.tool kdiff3 
 git config --global --add mergetool.kdiff3.pathC：/ Program Files / KDiff3 / kdiff3.exe
 git config --global  - add mergetool.kdiff3.trustExitCode false 
 
 git config --global --add diff.guitool kdiff3 
 git config --global --add difftool.kdiff3.pathC：/ Program Files /KDiff3/kdiff3.exe
 git config --global --add difftool.kdiff3.trustExitCode false 
  

注意：我可以通过简单的方式单独运行 KDiff3 文件，但我不能在我的git项目中运行它。任何想法？

编辑：这里是我的.gitconfig：

  [user] 
 email = [e-mail] 
 name = vahid najafi 
 [diff] 
 tool = kdiff3 
 guitool = kdiff3 
 [合并] 
工具= diffmerge 
工具= kdiff3 
工具= kdiff3 
 [mergetooldiffmerge] 
 trustExitCode = true 
 [mergetoolkdiff3] 
 path = C：/ Program Files / KDiff3 / kdiff3.exe 
 trustExitCode = false 
 [difftoolkdiff3] 
 path = C：/ Program Files / KDiff3 / kdiff3.exe 
 trustExitCode = false 
  

解决方案 meld 而不是 kdiff3 。首先从 meld =nofollow noreferrer>这里。然后在c：/Users/yourName/.gitconfig：

 <$ c $ b $ [b] [b] [b] [b] [b] [b] [b] [b] [b] [b] [b] [b] [b] difftoolmeld ] 
 path = C：/ Program Files（x86）/Meld/meld/meld.exe 
 [difftool] 
 prompt = false 
 [合并] 
工具= meld 
 [mergetoolmeld] 
 path = C：/ Program Files（x86）/Meld/meld/meld.exe 
 [mergetool] 
 keepBackup = false 
  

注意：尝试使用git cmd 而不是windows cmd 。当你有冲突时，运行： git mergetool 。有关详情和示例，请参阅此处。

After installing KDiff3 for managing conflicts in git, still the default one is opening for me:

Here is the configuration that mentioned in this answer:

git config --global --add merge.tool kdiff3
git config --global --add mergetool.kdiff3.path "C:/Program Files/KDiff3/kdiff3.exe"
git config --global --add mergetool.kdiff3.trustExitCode false

git config --global --add diff.guitool kdiff3
git config --global --add difftool.kdiff3.path "C:/Program Files/KDiff3/kdiff3.exe"
git config --global --add difftool.kdiff3.trustExitCode false

NOTE: I can be able to run KDiff3 individually with simple files, but I can't run it in my git project. Any idea?

Edit: Here is my .gitconfig :

[user]
    email = [e-mail]
    name = vahid najafi
[diff]
    tool = kdiff3
    guitool = kdiff3
[merge]
    tool = diffmerge
    tool = kdiff3
    tool = kdiff3
[mergetool "diffmerge"]
    trustExitCode = true
[mergetool "kdiff3"]
    path = C:/Program Files/KDiff3/kdiff3.exe
    trustExitCode = false
[difftool "kdiff3"]
    path = C:/Program Files/KDiff3/kdiff3.exe
    trustExitCode = false

解决方案

Finally I made another solution! I used meld instead of kdiff3. First download meld from here. Then change config for meld in c:/Users/yourName/.gitconfig :

[user]
    email = [e-mail]
    name = vahid najafi
[diff]
    tool = meld
[difftool "meld"]
    path = C:/Program Files (x86)/Meld/meld/meld.exe
[difftool]
    prompt = false
[merge]
    tool = meld
[mergetool "meld"]
    path = C:/Program Files (x86)/Meld/meld/meld.exe
[mergetool]
    keepBackup = false

NOTE: Try to use git cmd instead of windows cmd. When you have conflict, just run : git mergetool. For more detail and example, see here.

这篇关于git - 将KDiff3设置为默认的mergetool的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！