如何解决Eclipse SVN中的冲突 [英] How to Resolve Conflict in Eclipse SVN

问题描述

在编译和SVN中使用Eclipse进行团队存储库时，我在Eclipse中发生冲突时遇到困难。

While using Eclipse in coding and SVN for the team repository, I am having trouble in having conflicts in Eclipse.

假设我有冲突，有3个自动生成的文件。一旦解决了冲突，我找不到命令如何提交冲突的解决方案并自动删除生成的文件。

Supposing I have a conflict and there 3 automatically generated files. Once I have resolved the conflict, I can't find the command how to commit the solution of the conflict and automatically deleting the generated files.

在Eclipse以外的SVN中，是一个解决冲突功能，代码将被更新。此外，生成的冲突文件将被删除。有没有类似的方法在Eclipse或我必须手动删除生成的文件并提交解决方案？

In SVN outside Eclipse, there is a Resolve Conflict function and the codes will be updated. Also, the generated files for the conflict will be deleted. Is there a similar method in Eclipse or I have to manually delete the generated files and commit the solution?

推荐答案

除了答案在相关问题中显示，也可以解决冲突，删除自动生成的文件，并将标记为合并。

Aside from the answers shown in the related question, it is also possible to solve the conflict, delete the automatically generated files and Mark as Merged.

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