KDiff3如何与TortoiseSVN一起正确使用以解决冲突？ [英] How can KDiff3 be used properly with TortoiseSVN to resolve conflicts?

问题描述

我已将TortoiseSVN设置为使用KDiff3作为冲突解决工具（与内置的TortoiseMerge相比，它显示出更多的信息对合并有用）。

I have TortoiseSVN set up to use KDiff3 as the conflict resolution tool (I find it shows more information useful to the merge than the built-in TortoiseMerge does).

使用Tortoise的编辑冲突命令打开文件时，它将显示三个文件，我必须手动选择合并->合并当前文件。问题是KDiff3将结果保存到 source_file.working 而不是 source_file 。因此，如果不执行另存为，则不会修改有冲突的真实文件。

When I open a file with Tortoise's "Edit Conflicts" command it shows me the three files and I have to select "Merge->Merge Current File" manually. The problem is that KDiff3 saves the result to source_file.working instead of to source_file. So without doing a Save As, the real file with the conflict doesn't get modified. Is there a way around doing this manual Save As every time?

我知道这并不是严格意义上的编程问题，但它涉及到一个对于程序员来说足够普遍的辅助过程。应该在这里有用。我在其他地方找不到答案。

I know this isn't strictly a programming question but it's about an ancillary process common enough to programmers that it should be useful here. I couldn't find the answer to this elsewhere.

推荐答案

我的矿井更长一些：

"C:\Program Files\KDiff3\kdiff3.exe" %base %mine %theirs -o %merged --L1 Base --L2 Mine --L3 Theirs

这篇关于KDiff3如何与TortoiseSVN一起正确使用以解决冲突？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！