简体繁体 English

SVN eclipse 合并问题

[英]Problem with SVN eclipse Merging

原文 2011-07-02 14:06:35 3 1 svn/ subversive

Hallo, I have a very weired problem with my Galileo Eclipse running SVN Subversive.你好，我的 Galileo Eclipse 运行 SVN Subversive 有一个非常奇怪的问题。 In the past, my manager showed me how to merge my branch to the trunk.过去，我的经理向我展示了如何将我的分支合并到主干。

1. Update my copy of the Trunk 1.更新我的Trunk副本
2. Right Click, Team->Merge 2.右键单击，团队->合并
3. In the URL, I write the URL of my branch, and Depth "Working Copy" and click OK 3.在URL中，我写的是我的分支的URL，深度为“Working Copy”，点击OK
4. It takes some time for merging and then it shows these red icons where there are conflicts. 4. 合并需要一些时间，然后在有冲突的地方显示这些红色图标。

I did all these steps above, but the problem is, it doesn't show these red icons at all.我做了上述所有这些步骤，但问题是，它根本没有显示这些红色图标。 But rather it shows me this greater than symbol ">" before the name of each folder, and this means (as far as I know) that changes haven't been committed.而是它在每个文件夹的名称之前向我显示了大于符号“>”，这意味着（据我所知）尚未提交更改。

Can anybody help me please?有人可以帮我吗？ Because I want to commit my work to the trunk!因为我想把我的工作交给后备箱！

1 个解决方案

If you don't have any conflicts, it should do the merge into your local working copy which you then have to commit to the repository.如果您没有任何冲突，它应该合并到您的本地工作副本中，然后您必须将其提交到存储库。