如何通过svn Eclipse插件来解决树的冲突 [英] How to resolve tree conflicts through svn Eclipse plugin

问题描述

我最近在我的日食中安装了svn插件，我想知道通过它解决我的项目的树冲突的方式。

等待你的宝贵回复。好吧，你没有提到你的操作系统是Windows还是linux。无论如何，如果是Windows，您可以下载插件来解决冲突，即乌龟。借助此插件，您可以直接解决任何类型的冲突，无论是文本冲突还是树冲突。您需要做的只是右键单击有冲突的文件，有这么多选项，只需选择所需的选项，并在必要时进行必要的更改。就是这样。

如果是Linux，那么只需在项目浏览器中打开冲突影响的文件，右键单击该文件，然后将该文件与分支中的相同文件进行比较即你想要合并到你的本地代码中）。如果有任何更改，将打开文件进行比较和编辑，如果文件不变，那么它将显示一个没有区别的弹出窗口。
此步骤后，再次右键单击文件，此时选择解决冲突选项。您的文件将被更新，冲突也将被解决。

我希望解决您的问题有所帮助。

谢谢，

vikS

I have installed svn plugin in my eclipse recently and i want to know the way to resolve tree conflicts of my project through it.

Waiting for your valuable reply.

解决方案

well, you didn't mention your OS whether it is windows or linux. anyway, if it is windows you can download plugin for resolving conflicts i.e. called "tortoise". With the help of this plugin you can directly resolve any type of conflicts whether it is text conflicts or tree conflicts. What you need to do do just right click on the file having conflict and there is so many options, just select your desired option and make necessary changes if required. That's it.

And if it is Linux then just open the conflict affected file in project explorer and right click on that, then compare that file with the same file in branch(i.e. that you want to merge into your local code). If there is any change it will open both the file to compare and edit if file is unchanged then it will display a popup that there is no difference. after this step just right click on file again and this time select "resolve conflict" option. Your file will be updated and conflict will be resolved also.

i hope it will make some sense to solve your problem.

Thanks,

vikS

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