• Status: Solved
  • Priority: Medium
  • Security: Public
  • Views: 748
  • Last Modified:

Conflicts in tree

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?

Thank you
0
ank5
Asked:
ank5
1 Solution
 
SurranoSystem EngineerCommented:
How does the icon of that particular "conflicted" folder look like?
If all's green checkmark within, can you try the following?
- move that complete directory outside the checkout structure (e.g. if it's D:\SVN\mytool\src\subdir, then move "subdir" to D:\temp)
- run update on its parent dir (in our example, D:\SVN\mytool\src)
- in worst case, do a fallback: move "subdir" from D:\temp to its original location
0

Featured Post

Upgrade your Question Security!

Your question, your audience. Choose who sees your identity—and your question—with question security.

Tackle projects and never again get stuck behind a technical roadblock.
Join Now