I received this message when I ran a SVN UP:
Skipped \'trunk/scripts/accountability_survey_report.php\'
At revision 1585.
Summary of conflicts:
Skipped pat
Some more info, trying to deduce what happened, I found this error message when doing a svn info FILENAME Tree conflict: local delete, incoming edit upon update and this one: Tree conflict: local obstruction, incoming add upon merge I found this post that fixed my problem: http://little418.com/2009/05/svn-local-obstruction-incoming-add-upon-merge.html