svn conflict

Craig Treleaven ctreleaven at
Fri Oct 17 17:55:05 PDT 2014


I've ended up with an svn conflict--just in the capitalization of the 
directory name, if I'm reading this right.

SixBare:mp-trunk-ports craigtreleaven$ svn status
?       sysutils/MacPorts_daemondo
!     C sysutils/macports_daemondo
       >   local add, incoming add upon update

I tried:

$ svn resolve --accept theirs-conflict sysutils/MacPorts_daemondo

but the conflict remains.

How do I resolve this?


More information about the macports-dev mailing list