Re: [Subclipse-users] file remains in conflict error, empty error dialog

On Fri, Feb 20, 2009 at 9:00 AM, David Balažic
<david.balazic_at_hermes-softlab.com> wrote:

> I have a file with conflicts in the Outgoing window. It has a small yellow
> triangle with an exclamation mark.

That is a fairly new decorator. It actually means you have Property
conflicts. We still do not have a good way to resolve those, but
there are some changes coming in next version that maybe would make
this more clear. It would at least tell you it was a property
conflict when you take the Mark Resolved option.

The Edit Conflicts option should really be not available in this
situation, at least until we have a way to let you edit them. I think
this is also fixed.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=1198620
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].