我刚刚在 Eclipse IDE 中进行了从分支到主干的 svn 合并，在合并结果视图中，有以下图标：
替代文本 http://www.freeimagehosting.net/uploads/2a0a0f90b1.jpg
我很想知道它的含义。我搜索了整个 Eclipse 文档和一些相关的 StackOverflow 问题，但找不到任何内容。
关于合并结果的 CollabNet 文档视图解释了合并结果视图是什么，但没有提及其图标的含义。
有谁知道吗？谢谢！
I just did an svn merge from a branch to a trunk in my Eclipse IDE, and in the Merge Results view, there is this following icon:
alt text http://www.freeimagehosting.net/uploads/2a0a0f90b1.jpg
I am dying to know what it means. I have searched the entire Eclipse documentation and some relevant StackOverflow questions, but couldn't find anything.
The CollabNet documentation about Merge Results View explains what a Merge Results View is, but doesn't mention anything about the meanings of its icons.
Does anyone know? Thanks!
发布评论
评论（2）
我相信这是 SVN 树冲突的图标，这是 SVN 1.6 中的新功能。尝试执行“显示树冲突”选项并查看相同的项目是否出现在树冲突视图中。另请参阅：
http://blogs .open.collab.net/svn/2009/03/subversion-160-and-tree-conflicts.html
I believe that is the icon for a SVN tree-conflict which is new in SVN 1.6. Try doing Show Tree Conflicts option and see if the same items appear in the tree conflicts view. Also see:
http://blogs.open.collab.net/svn/2009/03/subversion-160-and-tree-conflicts.html
我刚刚遇到了同样的事情。
经过一番挖掘后，我相信这意味着两个地方的文件都发生了更改，但更改是相同的，因此文件是相同的。
I've just hit up against the same thing.
After a bit of digging around I believe that it means there were changes to the file in both places however the changes are the same, therefore the files are the same.