What does this Eclipse icon mean in a Merge Results view?

Posted by user68759 on Stack Overflow See other posts from Stack Overflow or by user68759
Published on 2010-03-17T01:47:39Z Indexed on 2010/03/17 1:51 UTC
Read the original article Hit count: 411

Filed under:

svn-merge

|

eclipse

|

subclipse

|

icon

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

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!

© Stack Overflow or respective owner

Related posts about svn-merge

svn merge - moved repository to a different server, and now getting 'has different repository root'

as seen on Stack Overflow - Search for 'Stack Overflow'
This is kind of similar to http://stackoverflow.com/questions/1601021/subversion-merge-has-different-repository-root-than - but appears to be a very different cause (especially as the answer for that question didn't resolve my problem). A while back, we swapped out the server where our SVN repositories… >>> More
SVN Merge two reposiories - what about the UUIDs?

as seen on Server Fault - Search for 'Server Fault'
Hi, This is my scenario: Originally had two seperate repositories, I need to merge these into one repository. I don't care too much about the history in these repositories. I created a new repository and can import the repositories no problem. The issue is with users working copies, I can ask them… >>> More
SVN merge loses files and code

as seen on Stack Overflow - Search for 'Stack Overflow'
Hi. I'm trying to merge trunk change-set into a branch, but have found out a lot of post-merge issues, including whole files that disappeared, and missing code blocks I'm using SVN 1.6 for both clients and server. Tried this with multiple clients - Eclipse, Netbeans and SVN - the result is the same… >>> More
svn merge from trunk to branch conflict for a file deleted in the trunk

as seen on Stack Overflow - Search for 'Stack Overflow'
After a subversion merge from trunk to branch, I got a conflict because a file has been deleted in the trunk and modified in the branch. I would like to keep the trunk choice, but using "svn resolve --accept theirs-full" from the branch directory tells me svn: warning: Tree conflicts can only… >>> More
git-svn merge 2 svn branches

as seen on Stack Overflow - Search for 'Stack Overflow'
I using svn. I have two branches and on both of them were performed a lot of changes. In addition of one of the branches a lot of files were renamed, so now svn can not help me merge changes in those files (well know svn limitation). Is it possible using git-svn to perform the merge of the branches… >>> More

Related posts about eclipse

Issues using SoapUI with Eclipse

as seen on Stack Overflow - Search for 'Stack Overflow'
I get the following in the Error log when using the latest SoapUI 3.5. plugin in Eclipse Galileo on Ubuntu. Also, this seems to continually freeze Eclipse. I have tried a complete uninstall and restarting Eclipse with -clean argument to no avail. Has anyone encountered the same issue? Is there anything… >>> More
Eclipse Error Exporting Web Project as WAR

as seen on Stack Overflow - Search for 'Stack Overflow'
Hi I have the following error when I export my war file org.eclipse.core.runtime.CoreException: Extended Operation failure: org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentExportOperation at org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard.performFinish(DataModelWizard… >>> More
Eclipse wont open Android Xml files

as seen on Stack Overflow - Search for 'Stack Overflow'
I'm just starting with Android and everything seems to be working fine, but when I try to look at any XML file in eclipse, I get the following error. The only way I can see them is by "Opening With" - TextFile. org.eclipse.core.runtime.CoreException: Error opening the Android XML editor. Is the… >>> More
Compiling JS-Test-Driver Plugin and Installing it on Eclipse 3.5.1 Galileo?

as seen on Stack Overflow - Search for 'Stack Overflow'
I downloaded the source of the js-test-driver from: http://js-test-driver.googlecode.com/svn/tags/1.2 It compiles just fine, but one of the unit tests fails: [junit] Tests run: 1, Failures: 1, Errors: 0, Time elapsed: 0.012 sec [junit] Test com.google.jstestdriver.eclipse.ui.views.FailureOnlyViewerFilterTest… >>> More
Recursion in Ecore-File?!

as seen on Stack Overflow - Search for 'Stack Overflow'
Hey guys, just tried to convert towards a Ecore-Model from a given UML-Model. After this I am trying to create a Generator Model. Everytime I try to do this I get the Error Message, that there is a "Unhandled event loop exception" with this log: org.eclipse.swt.SWTException: Failed to execute… >>> More