Re: Decorator for SVN Conflict

> I also prefer the merge conflict icon. Maybe we should change the
> colors of the icon to red to to show the actual importance.

I assume it is for the same reasons that Brock and I stated -- overload of
the warning icon?

I will see if I can make the current icon look good, and also do some
searching for an alternative. I think that the Edit Conflicts and Mark
Resolved icons should ideally be modified to reflect the decorator we
choose -- that would have been the one benefit to using the warning icon.

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
Received on Sun Mar 6 00:07:22 2005