Hi:
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?
Craig
_______________________________________________
macports-dev mailing list
macports-dev@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-dev
