[root@localhost svnrepos]# svn up.
Updating’.’:
Skipped’pythonresource.txt’ – Node remains in conflict
At revision 14.
Summary of conflicts:
Skipped paths: 1

The solution is:
[root@localhost svnrepos]svn revert –depth=infinity pythonresource.txt
Reverted’pythonresource.txt’
[root@localhost svnrepos] svn up.
Reverted’pythonresource.txt’

After editing pythonresource.txt and commit locally again, go to the web server and svn up pythonresource.txt, everything is normal.

Or copy pythonresource.txt locally to another directory, commit, then copy pythonresource.txt to the original directory, and commit again. No error will be reported on the http server.

If it still doesn’t work, try a trick:

svn remove --force filename
svn resolve --accept=working filename

svn up