<div>
<div class="content wysiwyg-content">
I am using tortoise svn. When I try to update a folder, it complains about a sub folder with the following error message<br />
<br />
Skipped, remains conflicted.<br />
<br />
When I go inside this folder, it has all green checkmarks, so I can't find out what is the conflict.<br />
<br />
Has anyone seen this behavior and any ideas to resolve it?<br />
<br />
Thank you
</div>
</div>


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

Conflicts in tree

Version control, also known as revision control or source control, is the management of changes to documents, computer programs, large web sites, and other collections of information. Changes are usually identified by a number or letter code, termed the "revision number," "revision level," or simply "revision." Version control systems (VCS) most commonly run as stand-alone applications, but revision control is also embedded in various types of software such as word processors and spreadsheets, and in various content management systems. Revision control allows for the ability to revert a document to a previous revision. Git, a widely-used VCS, has its own topic; other popular systems include CVS, Subversion, Team Foundation Server (TFS), Visual SourceSafe (VSS) and Perforce.