[英]How to Resolve Conflict in Eclipse SVN
While using Eclipse in coding and SVN for the team repository, I am having trouble in having conflicts in Eclipse.在团队存储库中使用 Eclipse 进行编码和 SVN 时,我在 Eclipse 中遇到冲突时遇到了麻烦。
Supposing I have a conflict and there 3 automatically generated files.假设我有冲突并且有 3 个自动生成的文件。 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.
一旦我解决了冲突,我找不到命令如何提交冲突的解决方案并自动删除生成的文件。
In SVN outside Eclipse, there is a Resolve Conflict function and the codes will be updated.在 Eclipse 之外的 SVN 中,有一个 Resolve Conflict 功能,代码将被更新。 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?
Eclipse中是否有类似的方法,或者我必须手动删除生成的文件并提交解决方案?
除了相关问题中显示的答案外,还可以解决冲突,删除自动生成的文件并标记为合并 。
I had the same problem and none of the solutions mentioned resolved my issue. 我遇到了同样的问题,所提到的解决方案都没有解决我的问题。 When I would right-click on the folder, there was no option to resolve the conflict or mark as resolved or anything.
当我右键单击该文件夹时,没有选项可以解决冲突或标记为已解决或任何事情。
The way I resolved it in Eclipse (with Subclipse plugin), was right-clicking on the folder and selecting "Show Tree Conflicts". 我在Eclipse(使用Subclipse插件)中解决它的方法是右键单击该文件夹并选择“Show Tree Conflicts”。 This opened up a view pane in Eclipse called "SVN Tree Conflicts" which showed the folder in question.
这在Eclipse中打开了一个名为“SVN Tree Conflicts”的视图窗格,其中显示了相关文件夹。
I right-clicked that message and selected "Resolve". 我右键单击该消息并选择“Resolve”。 Then a window popped up, asking what I wanted to do.
然后弹出一个窗口,询问我想做什么。 I basically unchecked all the boxes, that had to do with accepting left file or right file or merging.
我基本上取消选中所有框,这与接受左文件或正确文件或合并有关。 Because basically, I just wanted to mark the conflict as resolved, and accept the folder as it was, from the repository.
因为基本上,我只想将冲突标记为已解决,并从存储库接受该文件夹。
Then I was able to continue updating my project without issues. 然后我能够继续更新我的项目而没有问题。
In Eclipse on the Team menu you can choose either edit conflicts
or mark resolved
在Team菜单的Eclipse中,您可以选择
edit conflicts
或mark resolved
我这样做是将视角更改为“ 团队同步 ”,在同步选项卡中右键单击文件并选择“ 标记为已合并 ”
Another solution (similar to princepieros) is to Right-Click your project -> Execute an entire commit -> It will show "Conflict" items -> Right-Click these items and hit "Mark as Merged" or "Edit Conflict". 另一个解决方案(类似于princepieros)是右键单击您的项目 - >执行整个提交 - >它将显示“冲突”项目 - >右键单击这些项目并点击“标记为合并”或“编辑冲突”。 This did the trick for me.
这对我有用。 Hope it helps.
希望能帮助到你。
I did the following steps:我做了以下步骤:
filename.java <-- Original file filename.java <-- 原始文件
filenam.java.mine <-- My file filenam.java.mine <-- 我的文件
filename.java.revisionNumber <-- Their file (incoming file that caused conflict) filename.java.revisionNumber <-- 他们的文件(导致冲突的传入文件)
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.