SVN: Resolve a conflict on a folder

svn: E155015: Échec de la propagation (commit), détails :
svn: E155015: Arrêt de la propagation : '/var/www/prj/wp-content/cache' demeure en conflit

To do this:

svn resolve --accept=working /var/www/prj/wp-content/cache

For an entire directory (accept all)

svn resolve  --accept=working --depth  infinity

Precautions before executing the order

This tutorial retains the command and the context of its publication. Before using it on a current repository, inspect the branch, the modified files, and the exact target:

git status --short
git log --oneline --decorate -5

Create a backup branch or tag when the operation rewrites history or deletes files. In particular, git reset --hard overwrites the changes in the working directory.

Reference: official documentation of git reset.