Summary of conflicts:

Updating '.':
Skipped 'application/extra/site.php' -- Node remains in conflict
At revision 153.
Summary of conflicts:
Skipped paths: 1

 

解决办法：

svn resolve --accept working application/extra/site.php

svn revert application/extra/site.php

svn up