SVN: Resolve a conflict on a folder

To resolve this kind of conflict on a working copy: svn: E155015: Échec de la propagation (commit), détails&nbsp;: svn: E155015: Arrêt de la propagation&nbsp;: '/var/www/prj/wp-content/cache' demeure en conflit To do this: svn re...

Written by Thomas Bourdin Published on April 15, 2015 1 min read

To resolve this kind of conflict on a working copy:

svn: E155015: Échec de la propagation (commit), détails&nbsp;:
svn: E155015: Arrêt de la propagation&nbsp;: '/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