Want to win a PS4? Go Premium and enter to win our High-Tech Treats giveaway. Enter to Win

x
?
Solved

Conflicts in tree

Posted on 2014-01-07
1
Medium Priority
?
691 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

New feature and membership benefit!

New feature! Upgrade and increase expert visibility of your issues with Priority Questions.

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…
When working in a large software development team, whether you have many developers working on the same projects, or your project is linked to other projects; it is very important that developers regularly perform "get latest" to ensure that the cha…
In this video, Percona Solution Engineer Rick Golba discuss how (and why) you implement high availability in a database environment. To discuss how Percona Consulting can help with your design and architecture needs for your database and infrastr…
Want to learn how to record your desktop screen without having to use an outside camera. Click on this video and learn how to use the cool google extension called "Screencastify"! Step 1: Open a new google tab Step 2: Go to the left hand upper corn…
Suggested Courses

636 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