Solved

Conflicts in tree

Posted on 2014-01-07
1
567 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
1 Comment
 
LVL 8

Accepted Solution

by:
Surrano earned 500 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

How to run any project with ease

Manage projects of all sizes how you want. Great for personal to-do lists, project milestones, team priorities and launch plans.
- Combine task lists, docs, spreadsheets, and chat in one
- View and edit from mobile/offline
- Cut down on emails

Join & Write a Comment

Suggested Solutions

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…
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…
Sending a Secure fax is easy with eFax Corporate (http://www.enterprise.efax.com). First, Just open a new email message.  In the To field, type your recipient's fax number @efaxsend.com. You can even send a secure international fax — just include t…
This video explains how to create simple products associated to Magento configurable product and offers fast way of their generation with Store Manager for Magento tool.

747 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

Need Help in Real-Time?

Connect with top rated Experts

9 Experts available now in Live!

Get 1:1 Help Now