Solved

Conflicts in tree

Posted on 2014-01-07
1
589 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

Master Your Team's Linux and Cloud Stack

Come see why top tech companies like Mailchimp and Media Temple use Linux Academy to build their employee training programs.

Question has a verified solution.

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

Suggested Solutions

Title # Comments Views Activity
subversion post-commit hook issue 4 559
Deploying test website using Git subtree 3 146
team foundation server 3 75
Breaking link to TFS source control 2 36
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…
In a recent question (https://www.experts-exchange.com/questions/28997919/Pagination-in-Adobe-Acrobat.html) here at Experts Exchange, a member asked how to add page numbers to a PDF file using Adobe Acrobat XI Pro. This short video Micro Tutorial sh…
The Email Laundry PDF encryption service allows companies to send confidential encrypted  emails to anybody. The PDF document can also contain attachments that are embedded in the encrypted PDF. The password is randomly generated by The Email Laundr…

832 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