[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [Subclipse-users] Unable to mark property conflict as resolved

From: Mark Phippard <markp_at_softlanding.com>
Date: 2006-09-06 01:56:07 CEST

Daniel Serodio <daniel.listas@xxx.com.br> wrote on 09/05/2006 05:59:58 PM:

> I had a conflict in a project root's svn:ignore property, which I
> resolved using TortoiseSVN. Now, Subclipse still thinks that this
> property is in conflict (the "SVN Properties" view says "Conflict on one
> or more properties"), but "Mark resolved" and "Edit conflicts" are
> disabled. I've tried refreshing the project, closing and re-opening it,
> and synchronizing it, but it didn't make a difference.
> TortoiseSVN shows the property in question as "modified".

Those problem markers are a little more sensitive, Since you did not
resolve the conflict in Subclipse you probably just are not able to
trigger them to remove themselves. Have you tried committing? I would
assume the commit dialog would be correct and the markers might go away
after a commit.


To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Wed Sep 6 01:56:23 2006

This is an archived mail posted to the Subclipse Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.