[Kdiff3-user] KDiff3 sometimes auto resolves merge conflicts, which causes problems

[Michael M. <mlm...@ho...>]

Wed 2011-Sep-07 0832 PDT
 
Hello,
 
I like the KDiff3 tool for merging changes in source code files (being able to choose and edit merge selections is great). One problem that I have, though, is that I don't want the tool to automatically resolve merge conflicts with Git. I have found that when Git responds that there is a merge conflict that it cannot resolve, I invoke KDiff3 as the merge tool to manually resolve the conflict. Unfortunately, KDiff3 will sometimes resolve the merge conflict without ever bringing up the GUI for me to use. I have found that this causes problems with the merge. If Git can't resolve the merge conflict then why does KDiff3 do it automatically?)
 
I have tried specifying the "--qall" option when configuring Git to use KDiff3, but this does not seem to always work. The KDiff3 documentation says this about the "--qall" option:
 
  --qall              Don't solve conflicts automatically. (For compatibility...)
 
What does the phrase "For compatibility..." mean?
 
Here is how I currently have my global Git configuration for the merge tool:
 
  [merge]
          tool = kdiff3
  [mergetool "kdiff3"]
          trustExitCode = false
          cmd = kdiff3 --qall $BASE $LOCAL $REMOTE -o $MERGED
 
Is there a way to configure KDiff3 so that it never auto resolves merge conflicts?
 

Thanks,
Michael