Subclipse冲突解决 [英] Subclipse conflict resolution

问题描述

在提交之前，我和我的朋友使用flex builder（基于eclipse的）与子程序进行通信，但总是更新，但有时我无法提交冲突。然后我使用Team-> Synchronization with Repository，它显示在最新版本的右侧，左侧是我当前的工作副本。它具有从所有非冲突从右到左复制的按钮（从最新的存储库到我的工作副本）。但是仍然存在冲突的线条。

有时我只想从左到右复制，但没有按钮（我的意思是用我的行覆盖仓库文件行） 。从右到左复制非冲突部件后，我只想提交左侧（我想覆盖并提交我的最终文件到存储库）。由于这些冲突问题，我无法承诺。然后我的朋友可以使用Replace With-> Latest from Repository命令获取最新的覆盖版本。

Subclipse文档很弱，在互联网上找不到任何好的指南。你可以一步一步地解释一下像我一样的虚拟的次级冲突解决吗？一个显示步骤的视频，或者一个外来的技术来快速解决它将是很好的。有没有更好（更容易）的解决方案来源控制eclipse？

（我使用subclipse 1.4）

解决方案

是的，你是对的没有按钮。在Diff View（并排视图）中，红色的项目是冲突的。它们不能自动合并。您必须检查冲突的项目，并通过复制/编辑冲突的代码块来手动解决。

提交或从存储库更新（与存储库同步）您将在控制台视图中看到某些项目处于冲突状态。当您查看该包中的该文件时，您将在原始文件旁边看到3个文件：

  myfile.txt （原文件）
 myfile.txt.mine 
 myfile.txt.r3293 
 myfile.txt.r3501 
  

右键单击原始文件，然后选择Team - > Edit Conflict。在提供的差异视图中，编辑左侧的文件以匹配所需的最终结果。 （即，您可能希望保留一些更改，并从SVN的修订版中复制新的更新，放弃所有更改，只保留更改等）完成后，保存文件。再次右键单击您的原始文件，然后选择Team - > Mark Resovled。

您将看到添加3个文件消失。您现在可以安全地提交您的工作。

由于SVN无法确定在发生此类冲突时最佳选项，因此没有简单的方法。 p>

Me and my friend using flex builder (eclipse based) with subclipse for a project.

Before committing I always update but sometimes I could not commit because of conflicts. Then I use Team->Synchronize with Repository and it shows at the right side latest from repository and at the left side the my current working copy. It has a button to copy from all non-conflicts from right to left (from latest repository to my working copy). But there are still conflicting lines.

Sometimes I just want to copy from left to right but there is no button for that (I mean overwriting repository file lines with my lines). After copying non-conflicting parts from right to left I just want to commit left side (I want to overwrite and commit my final file to repository). I cannot commit because of these conflict issues. Then my friend can use Replace With-> Latest from Repository command to get latest overwrited version.

Subclipse documentation is weak I could not find any good guide on the Internet. Could you explain subclipse conflict resolution step by step for a dummy like me? A video showing the steps, or an alien technology to fix it quickly will be fine. Are there any better (easier) solution for source control for eclipse?

(I use subclipse 1.4)

解决方案

Yes, you are right. There is no button for that. in the Diff View(Side-by-Side View) the items in red are in conflict. They can not be automatically merged. You must review the item in conflict and manually resolve it by copying/editing the block of code that is in conflict.

After committing to or updating from repository(Synchronize with Repository) you'll see in the Console view that some items are in conflict. When you take a look at that file in Package you'll see 3 files right next to your original file:

myfile.txt (original file)
myfile.txt.mine
myfile.txt.r3293 
myfile.txt.r3501

Right-click your original file then select Team -> Edit Conflict. In the Diff View provided, edit the file on the left-side to match the final result you want. (i.e. You may want to keep some of your changes and copy over new update from the revision in SVN, discard all changes and only keep your changes, etc.) After you are done, save the file. Right click your original file again then select Team -> Mark Resovled.

You will see that the addition 3 files disappear. You can now "safely" commit your work.

There is no easy way to do this since SVN can't decide what's the best option when such conflict arise.

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