Solution for svn: E155033: Conflict not set.

If you get this error and svn up doesn’t help. This command below will revert the folder but be carful all your local changes would be lost

svn revert . -R

So the solution would be

  1. Backup – backup to some folder
  2. svn revert “yourfolder” -R – run on the folder with issues
  3. svn update
  4. Merge the backup files to the folder
  5. And then you can commit your changes

Leave a Comment