?
Solved

Conflicts in tree

Posted on 2014-01-07
1
Medium Priority
?
645 Views
Last Modified: 2014-02-16
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
Comment
Question by:ank5
[X]
Welcome to Experts Exchange

Add your voice to the tech community where 5M+ people just like you are talking about what matters.

  • Help others & share knowledge
  • Earn cash & points
  • Learn & ask questions
1 Comment
 
LVL 8

Accepted Solution

by:
Surrano earned 2000 total points
ID: 39832187
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

On Demand Webinar: Networking for the Cloud Era

Ready to improve network connectivity? Watch this webinar to learn how SD-WANs and a one-click instant connect tool can boost provisions, deployment, and management of your cloud connection.

Question has a verified solution.

If you are experiencing a similar issue, please ask a related question

INTRODUCTION Subversion is a fantastic version management and software configuration management tool for teams and individuals to manage software applications. It offers many advantages over it's CVS ancestor such as it's built-in compatibility w…
Article by: gr8gonzo
Git can be a complicated version control system for beginners, but it definitely is one of the best ones out there. Since this article assumes that you're starting at square one, it will skip over things that Git -can- do and will focus on the typic…
Michael from AdRem Software outlines event notifications and Automatic Corrective Actions in network monitoring. Automatic Corrective Actions are scripts, which can automatically run upon discovery of a certain undesirable condition in your network.…
Michael from AdRem Software explains how to view the most utilized and worst performing nodes in your network, by accessing the Top Charts view in NetCrunch network monitor (https://www.adremsoft.com/). Top Charts is a view in which you can set seve…
Suggested Courses

770 members asked questions and received personalized solutions in the past 7 days.

Join the community of 500,000 technology professionals and ask your questions.

Join & Ask a Question