如何配置Beyond Compare 3 for Eclipse冲突解决？ [英] How to configure Beyond Compare 3 for Eclipse conflict resolution?

问题描述

在首选项>中，获得超越比较3的正确参数是什么？团队> SVN>差异/合并可以选择指定外部程序来解决冲突。

默认参数是：

 $ {yours}$ {theirs}$ {base}$ {merged}
  

它建议这样的TortoiseMerge设置：

  /他们的$ {theirs}/ base：$ {base}/ mine：$ {yours}/ merged：$ {merged}
  pre> 
 
 
但是Beyond Compare的相应配置是什么？
解决方案
看起来这是正确的：
 $ {theirs}$ {yours}$ {base} $ {merged}
  
根据此论坛帖子：
  http://www.scootersoftware.com/vbulletin/showthread.php?t=368#4  
 
 
 
要适当地标注这些部分，并在单独的（独奏）实例中运行BC，那就是这样：
 $ {theirs}$ {yours}$ {base}$ {merged}
 / lefttitle =收到（$ {他们}）
 / centertitle = $（$ {base}）
 / righttitle =本地（$ {yours}）
 / outputtitle =合并（$ {merged}）
 / solo 
  
 以上使用的多行可读性，替换换行符，使用空格，即 
 $ {theirs}$ {yours}$ {base}$ {merged}/ lefttitle =输入（$ {theirs}）/ centertitle =Base（$ {base}）/ righttitle =Local（$ {yours}）/ outputtitle =Merged（$ {merged}）/ solo 
  
 
What is the correct parameters to get Beyond Compare 3 working with Eclipse/Subclipse conflict resolution?

In Preferences > Team > SVN > Diff/Merge there's the option to specify an external program to resolve conflicts.

The default parameters are:
"${yours}" "${theirs}" "${base}" "${merged}"
And it suggests TortoiseMerge settings of this:
/theirs:"${theirs}" /base:"${base}" /mine:"${yours}" /merged:"${merged}"
But what is the appropriate config for Beyond Compare?
解决方案
Looks like this is correct:
"${theirs}" "${yours}" "${base}" "${merged}"
Based on this forum post:
http://www.scootersoftware.com/vbulletin/showthread.php?t=368#4

To label the sections appropriately, and run BC in a separate (solo) instance, it's this:
"${theirs}" "${yours}" "${base}" "${merged}"
/lefttitle="Incoming (${theirs})"
/centertitle="Base (${base})"
/righttitle="Local (${yours})"
/outputtitle="Merged (${merged})"
/solo
Multiple lines used above for readability, replace linebreaks with spaces for use, i.e.
 "${theirs}" "${yours}" "${base}" "${merged}" /lefttitle="Incoming (${theirs})" /centertitle="Base (${base})" /righttitle="Local (${yours})" /outputtitle="Merged (${merged})" /solo


                        
这篇关于如何配置Beyond Compare 3 for Eclipse冲突解决？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！