简体繁体 English

有没有一种方法可以检查所有手动解决的水银合并冲突？

[英]Is there a way to check all manual resolved merge conflicts of mercurial?

原文 2017-01-24 09:48:04 9 1 javascript/ version-control/ merge/ mercurial/ tortoisehg

Simple, as the question says, is there a way to check all manual resolved merge conflicts of the whole repository within mercurial (tortoise-hg)? 正如问题所言，这很简单，有没有办法检查Mercurial（tortoise-hg）中整个存储库的所有手动解决的合并冲突？

It would be awesome if I could track at least merges, where a conflict happened. 如果我至少可以跟踪发生冲突的合并，那就太好了。

1 个解决方案

The statement "no merge conflicts" is not something which can be answered - or stated unambiguously as it highly depends on the merge algorithm applied when merging automatically. “没有合并冲突”的说法是无法回答的，或者说得很明确，因为它高度依赖于自动合并时所应用的合并算法。 Check hg help merge-tools for the available internal algorithms. 检查hg help merge-tools以获得可用的内部算法。 You can configure your own external merge tools which might work better for you. 您可以配置自己的外部合并工具，可能会更好。 Can can even configure different merge tools for different file types. 甚至可以为不同的文件类型配置不同的合并工具。

If you choose "always use side A in case of conflicting information", then there simply will not ever be conflicts as it always can be resolved automatically. 如果选择“在信息冲突的情况下始终使用A面”，则将永远不会存在冲突，因为它始终可以自动解决。 Using more sophisticated algorithms, you will get differnt results depending on your choice and they may also differ in what they think they can handle automatically and suggest to you as merge result. 使用更复杂的算法，您会根据自己的选择获得不同的结果，并且它们在认为它们可以自动处理并建议给您合并结果方面也可能有所不同。

Additionally: whatever algorithm you choose, you always have the option to manually alter the file contents from what is suggested as merge result - and only then you commit your possibly edited merge result. 另外：无论选择哪种算法，始终可以选择手动将文件内容从建议的合并结果中更改出来-只有这样，您才能提交可能已编辑的合并结果。 Mercurial has no way of knowing whether you made manual changes, nor does it record what merge algorithm was used. Mercurial无法知道您是否进行了手动更改，也无法记录所使用的合并算法。