简体繁体 English

乌龟SVN-解决冲突，同时添加两者？

[英]Tortoise SVN - Resolve Conflict, add both?

原文 2014-01-28 10:29:17 8 2 svn/ tortoisesvn

A lot of times it happened, that multiple developers replaced the same line of code (one in branch, one in trunk for example), which resulted a conflict (when we did a branch->trunk merge). 很多时候，多个开发人员替换了同一行代码（例如，一个在分支中，一个在主干中），这导致了冲突（当我们进行分支->合并时）。 In these situations, the merge tool offers me to take either theirs, or mine. 在这种情况下，合并工具使我可以选择他们的，也可以选择我的。 However, I want TortoiseSVN to take both, and put them under each other. 但是，我希望TortoiseSVN两者都采用，然后放在彼此下面。 Till now, what I was doing is that I accepted one, and manually copy-pasted the other one under it. 直到现在，我所做的是我接受了其中一个，然后手动将另一个复制粘贴到了它下面。

Is there a built-in solution for this situation? 是否有针对这种情况的内置解决方案？

2 个解决方案

In the Resolve Conflict dialogue, click on "Edit conflict" (instead of "Use local" or "Use repository"): 在“解决冲突”对话框中，单击“编辑冲突”（而不是“使用本地”或“使用存储库”）：

解决冲突对话

If you are using the default tool (TortoiseMerge), right click on each conflict and select an appropriate option: 如果使用的是默认工具（TortoiseMerge），请右键单击每个冲突并选择适当的选项：

如果TortoiseMerge

Otherwise, go to "TortoiseSVN/ Settings" and set it back at "External Programs/ Merge Tool". 否则，请转到“ TortoiseSVN /设置”，然后将其重新设置为“外部程序/合并工具”。

Is there a built-in solution for this situation? 是否有针对这种情况的内置解决方案？

Visual Merge tool (instead of internal merge), which will fire on conflict and allow you to edit merge-result manually, as you want 可视合并工具（而不是内部合并），将在发生冲突时触发并允许您根据需要手动编辑合并结果