Re: How to resolve a conflict on svn:ignore property

Henri Dupre <henri.dupre@gmail.com> wrote on 04/12/2005 02:44:38 AM:

> I can't figure out how to resolve a conflict on the svn:ignore property
on the
> root of my project using subclipse. The "team" context menu doesn't
offer
> "Edit conflict...".

There are no editors to assist in editing propery conflicts. If I recall
from the Subversion documentation it creates a file with an extension of
.prej that contains the conflicting info. You just edit the properties to
make them what you want (which Subclipse does provide a UI for) and then
delete the .prej file to let Subversion know that you have resolved the
conflict. Of course you also then commit the changes.

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
Received on Tue Apr 12 22:58:27 2005