TortoiseSVN报告冲突，但找不到冲突 [英] TortoiseSVN reports conflict, but no conflict can be found

问题描述

我有整个存储库的工作副本，其中包含多个Python项目。当我选择右键单击-> Windows File Explorer中的SVN Update时，我收到一条错误消息，列出了特定的项目文件夹：

I have a working copy for my entire repository, which contains multiple Python projects. When I choose right-click --> SVN Update in Windows File Explorer I am getting an error message listing a particular project folder:

Command: Update
Updating: path\to\working\copy
Skipped obstructing working copy: path\to\working\copy\project
Completed: At revision: 176
Warning!: One or more files are in a conflicted state.

当我转到该项目并右键单击-> SVN Update时，它会成功更新。也没有可用的冲突编辑器，当我右键单击-> TortoiseSVN->解决时，没有可用的文件。

When I go to that project and right-click --> SVN Update, it updates successfully. There is also not conflict editor available and when I right-click --> TortoiseSVN --> Resolved there are not files available.

是什么原因引起了冲突？只要这种情况一直存在，就不可能在我的工作副本中更新该项目。

What could be causing the conflict? As long as this keeps occurring, it is impossible to update this project in my working copy.

推荐答案

Skipped obstructing working copy

这意味着途中有一个工作副本文件夹：您的更新想要添加一个名为项目的文件夹，但是您的工作副本中已经有一个版本化的文件夹项目。
也许您将该文件夹从另一个工作副本中移出了？或者该文件夹是其自己的工作副本（如果它具有隐藏的 .svn 文件夹，则它是一个独立的独立工作副本）。

this means that there's a working copy folder in the way: your update wants to add a folder with name 'project', but you already have a versioned folder 'project' in your working copy. Maybe you moved that folder from another working copy? Or that folder is its own working copy (if it has the hidden .svn folders then it's an independent, separate working copy).

要解决的问题：
将文件夹移出工作副本（或删除它）。然后再次运行更新。更新将再次获取具有相同名称的文件夹。但这可能与您的有所不同-这就是为什么我建议您移动文件夹并仅在检查更新后的文件夹与原始文件夹相同之后删除它。

To resolve: move the folder out of your working copy (or just delete it). Then run update again. The update will fetch a folder with the same name again. But it might not be the same as you had - that's why I recommend that you move the folder and delete it only after checking that the updated folder is identical with the original folder.

这篇关于TortoiseSVN报告冲突，但找不到冲突的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！