Can't resolve conflict

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?

Thx,

Skip Montanaro

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

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 03:24:40 CET