TortoiseSVN 工作副本文件夹有冲突但文件列表为空 [英] TortoiseSVN working copy folder with conflicts but file list is empty

问题描述

上下文:Windows 7 + TortoiseSVN + Visual Studio 2010 + VisualSVN

Context : Windows 7 + TortoiseSVN + Visual Studio 2010 + VisualSVN

在 windows 资源管理器中，我可以看到我的文件夹中的一个带有小红圈(好像有冲突).

In the windows explorer , I can see one of my folder with the little red circle (like there is a conflict).

所以我这样做:

Righ click on the folder -> TortoiseSVN -> Resolved

然后出现一个标题为resolve"的窗口，告诉我文件列表为空"

and then a window titled "resolve" appears telling me "file list is empty"

所以我点击确定"，我的文件夹仍然有红色圆圈，

So I click "Ok" and my folder is still has the red circle,

当我尝试清理"时，我的文件夹被标记为正常(绿色圆圈)，但如果我转到父目录并返回，红色圆圈会再次出现.

When I try "Clean Up", my folder is marked as ok (green circle), but if I go to the parent directory and come back, the red circle reappears.

也许我不太了解 svn 是如何工作的，但这真的很奇怪.

Maybe I didn't understand well how svn is working, but it's really strange.

谢谢.

推荐答案

小红圈不代表冲突，代表有修改.使用检查修改对话框查看修改的内容.

little red circle doesn't mean conflict, it means that there's a modification. Use the check-for-modifications dialog to see what exactly is modified.

这篇关于TortoiseSVN 工作副本文件夹有冲突但文件列表为空的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！