I went with the warning icon. We can always change it again. I did some
trials of a few different icons and variants. One thing I found is that
red icons didn't work real well because they are almost always going to be
next to the Eclipse error icon. The existing merged_ov icon looks OK, but
I just do not think it means anything. Anyway, this is what I wrote in the
Modified the icon we use to decorate an SVN conflict to be a warning icon.
previous icon was the same one used to show a conflict in the Synch view
they are different kinds of conflicts, that was confusing.
A warning icon is a bit confusing, primarily because they are used for so
other things in Eclipse. However, this situation is really a warning/error
condition from Subversion so it make sense that it be a warning or error
When you have a conflict in source code, the Subversion conflict markers
source to be in error, so you typically see the Eclipse error icon.
error icon for the decorator would be bad. Likewise, I tried some other
icons and they do not look good next to the error icon.
The final icon choice was the merged_ov.gif we already include but do not
our overlays. This icon looks good next to an error icon, but I just
it was communicating anything about the situation to the user.
So I decided to go with the warning icon. It can always be changed once
see it for real.
Finally, one benefit of the warning icon, is that the two conflict-related
we provide -- Edit Conflicts and Mark Resolved, both use this symbol in
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
Received on Sun Mar 6 07:53:19 2005