使用 Beyond Compare (Mercurial) 解决合并冲突
我正在使用 Mercurial，它被配置为在合并时出现冲突时打开 Beyond Compare。 BC 打开得很好，并向我显示了这两个文件，但我不知道之后要做什么。
通常在 BC 中，行旁边有不同的箭头，您可以单击它们将选择向左或向右移动。无论我如何选择一个部分，我都无法将代码从一侧移动到另一侧，或者选择一个特定的部分作为我想要保留的部分。这个用户界面非常简洁。我基本上可以看到差异，但不知道如何告诉 BC 我想保留哪一个。
I am using Mercurial and it's configured to open Beyond Compare when there is a conflict when merging. BC opens just fine and shows me the two files, but I have no idea what to do after that.
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. 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.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
要使用 Beyond Compare 执行三向合并，您必须拥有“Pro”版本。 “标准”版本不支持该功能。
你知道你有哪一个吗？
To perform a 3-way merge with Beyond Compare, you must have the "Pro" version. The "Standard" version does not support the feature.
Do you know which one you have?