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

Re: how to mark a property conflict as resolved

From: Brock Janiczak <brockj_at_tpg.com.au>
Date: 2005-04-13 11:29:36 CEST

Henri,
That would be a bug. "svn resolved" should apply to files and folders.
I have entered issue 280 for it.

Cheers,
Brock

Henri Dupre wrote:

> I'm still stuck with my conflict on svn:ignore property on the root of
> my project.
> According to SVN documentation, I should issue svn resolved to mark
> the conflict as resolved. But I can't find any way to mark a property
> as resolved. The "Team > Resolve Conflicts" does seem to apply only to
> files in the project not the top item.
>
> Henri
Received on Wed Apr 13 19:29:36 2005

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