Re: Can't resolve conflict

On Mon, Nov 30, 2009 at 9:23 PM, Skip Montanaro <skip_at_pobox.com> wrote:
> I have two files whose conflict I can't seem to resolve.  One of my colleagues svn rm'd it while I can local changes.  When I svn up'd I got:
>
> !     C traders/config_Ctrl.xml
>      >   local edit, incoming delete upon update
> !     C configs/rigel_Ctrl.xml
>      >   local edit, incoming delete upon update
>
> (Actually, it started out "A", not "!".  Some machinations of mine made that change.  I have no idea what.)
>
> I just want to resolve the damn thing and accept the fact that the files have been removed from the repo.  How do I do that?

Revert the file ("svn revert /path/to/file"), then do your update.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2425743

Please start new threads on the <users_at_subversion.apache.org> mailing list.
To subscribe to the new list, send an empty e-mail to <users-subscribe_at_subversion.apache.org>.
Received on 2009-12-01 04:24:24 CET