Conflicts in tree
Posted on 2014-01-07
I am using tortoise svn. When I try to update a folder, it complains about a sub folder with the following error message
Skipped, remains conflicted.
When I go inside this folder, it has all green checkmarks, so I can't find out what is the conflict.
Has anyone seen this behavior and any ideas to resolve it?