How could I force mergetool GUI (KDiff3) to be always shown?

前端 未结 5 777
被撕碎了的回忆
被撕碎了的回忆 2020-12-13 18:07

How could I force the mergetool GUI to be always shown and disable any automatic resolving?

Sometimes when there is a conflict during a merge and I use the mergetool

5条回答
  •  [愿得一人]
    2020-12-13 18:55

    If the problem strictly relates to unwanted conflict auto-resolution...

    Once KDiff3 has opened, you could just press a Merge / Set Deltas to Conflicts from the menu, and the state gets updated to a beautiful, man-driven conflict resolution problem.

提交回复
热议问题