eGit合并分辨率 - 使用您的副本 [英] eGit Merge Resolution - Use Your Copy

问题描述

我仍然对eGit很陌生。我试图弄清楚如何通过我的副本让eGit解决合并冲突，而不是改变。我指的是eGit Wiki上的注释：

http ：//wiki.eclipse.org/EGit/User_Guide#Possible_merge_results

但是，当我添加我的副本以解决冲突时，eGit仍会保留差异标记在文件<<<<<<<< HEAD"，=======，>>>>>>>。在使用Merge-Tool之后，文档说要添加：

编辑工作树版本，直到您满意为止Team> Add
将合并资源标记为解决冲突提交合并
通过Team> Commit提交

然而，它仍然会离开在使用我的副本解决了冲突之后，文件中的diff标记确实不会导致更改，因此不需要保存。我的问题是如何让eGit接受，添加和提交我的副本而不在文件中留下diff标记？这些标记会在最终提交时消失吗？

解决方案

当错误得到解决时，请执行错误提示中的建议

Frank Jakop CLA 2013-07-08 09:53:34 EDT我们非常感谢这
，目前我们必须通过插入然后
删除文件中的空间，保存并添加到索引来解决方法。

I still new to eGit. I'm trying to figure out how on earth to get eGit to resolve a merge conflict using my copy, no change. I'm referring to the notes on the eGit Wiki:

http://wiki.eclipse.org/EGit/User_Guide#Possible_merge_results

However, when I add my copy to resolve the conflict, eGit still leaves the diff marks in the file "<<<<<<< HEAD", "=======", ">>>>>>>". The doc says to add after using Merge-Tool:

edit the working tree version until you are happy with it Team > Add the merged resource to mark the conflict as resolved commit the merge commit via Team > Commit

However, it still leaves the diff marks in the file after I've resolved the conflict using my copy, which really results in no change, and therefore, requires no save. My question is how do I get eGit to accept, add, and commit my copy without leaving the diff markers in the file? Will these markers go away at the final commit?

解决方案

While the bug is solved, do what is suggested on the bug comments

Frank Jakop CLA 2013-07-08 09:53:34 EDT We wold very appreciate this too, at the moment we have to "workaround" by inserting and then deleting a space in the file, save and add to index.

这篇关于eGit合并分辨率 - 使用您的副本的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！