Decorator for SVN Conflict

Currently, we are using the same icon for a Subversion conflict that is
used by the Synch view for a conflict. Since these are not the same
thing, this is probably not a good idea. So I think we should use a new
icon for the Subversion conflicts. I am open to suggestions but I have
two proposals attached.

I think the best option is the warning icon. If you look at the current
icons we provide for Edit Conflict and Mark Resolved, they both involve
this icon, so it is natural fit. The only real negative is that is the
same decorator that JDT and many other tools use for their warnings. So
you can get decorator overload of seeing the same decorator.

The other option is the one that CVS provides. Their help says it is for
a merge conflict, but makes it sound like you would rarely if ever see it.
 It also is not very distinctive and doesn't convey any sense of urgency
that the icon probably ought to be conveying.

So I vote for the warning icon, but will wait to hear what you think.

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________