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.

svn version-control tortoisesvn conflict working-directory
Edit
Report