Re: Can't resolve conflict

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

Thanks. I was certain I had tried that, but apparently in my frustration I
either failed to do that or mistyped it.

-- 
Skip Montanaro - skip@pobox.com - http://www.smontanaro.net/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2425754
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>.