SVN eclipse 合并问题
你好， 我的 Galileo Eclipse 运行 SVN Subversive 时遇到一个非常奇怪的问题。过去，我的经理向我展示了如何将分支合并到主干。
1. 更新我的主干副本
2.右键单击Team->Merge
3. 在 URL 中，我写入分支的 URL 和深度“工作副本”，然后单击“确定”
4. 合并需要一些时间，然后在有冲突的地方显示这些红色图标。
我执行了上述所有步骤，但问题是，它根本不显示这些红色图标。相反，它向我展示了这个大于符号“>”在每个文件夹的名称之前，这意味着（据我所知）更改尚未提交。
有人可以帮我吗？因为我想把我的工作交给主干！
Hallo,
I have a very weired problem with my Galileo Eclipse running SVN Subversive. In the past, my manager showed me how to merge my branch to the trunk.
1. Update my copy of the Trunk
2. Right Click, Team->Merge
3. In the URL, I write the URL of my branch, and Depth "Working Copy" and click OK
4. It takes some time for merging and then it shows these red icons where there are conflicts.
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!
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（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.