TortoiseSVN reports conflict, but no conflict can be found

Question

I have a working copy for my entire repository, which contains multiple Python projects. When I choose right-click --> SVN Update in Windows File Explorer I am getting an error message listing a particular project folder:

Command: Update Updating: path\to\working\copy Skipped obstructing working copy: path\to\working\copy\project Completed: At revision: 176 Warning!: One or more files are in a conflicted state. 

When I go to that project and right-click --> SVN Update, it updates successfully. There is also not conflict editor available and when I right-click --> TortoiseSVN --> Resolved there are not files available.

What could be causing the conflict? As long as this keeps occurring, it is impossible to update this project in my working copy.

Answer 1

Skipped obstructing working copy 

this means that there's a working copy folder in the way: your update wants to add a folder with name 'project', but you already have a versioned folder 'project' in your working copy. Maybe you moved that folder from another working copy? Or that folder is its own working copy (if it has the hidden .svn folders then it's an independent, separate working copy).

To resolve: move the folder out of your working copy (or just delete it). Then run update again. The update will fetch a folder with the same name again. But it might not be the same as you had - that's why I recommend that you move the folder and delete it only after checking that the updated folder is identical with the original folder.