解决与Beyond Compare（Mercurial）的合并冲突
[英]Resolving merge conflict with Beyond Compare (Mercurial)
问题描述
I am using Mercurial and it's configured to open Beyond Compare when there is a conflict when merging. 
我正在使用Mercurial，它被配置为在合并时发生冲突时打开Beyond Compare。 BC opens just fine and shows me the two files, but I have no idea what to do after that. BC打开很好，并向我展示了两个文件，但我不知道在那之后该怎么做。
Normally in BC there are arrows next to the lines which differ where you can click on them to move the selection to the left or the right. 通常在BC中，线条旁边有箭头，这些箭头不同，您可以点击它们将选区向左或向右移动。 No matter how I select a section I can not move code from one side to the other, or select a specific section as the one I want to keep. 无论我如何选择一个部分，我都无法将代码从一侧移动到另一侧，或者选择一个特定的部分作为我想要保留的部分。 This UI is very consing. 这个用户界面很有用。 I basiclly can see the differences but don't know how to tell BC which one I want to keep. 我基本上可以看到差异，但不知道如何告诉BC我想保留哪一个。
1 个解决方案
解决方案1
8 已采纳 2011-08-19 13:00:43
To perform a 3-way merge with Beyond Compare, you must have the "Pro" version . 要与Beyond Compare执行3向合并，您必须拥有“Pro”版本 。 The "Standard" version does not support the feature. “标准”版本不支持该功能。
Do you know which one you have? 你知道你有哪一个吗？
声明:本站的技术帖子网页，遵循CC BY-SA 4.0协议，如果您需要转载，请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.