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
In this case I delete entery folder, then svn up and if needed svn switch.