Tortoise SVN 不会提交，冲突 [英] Tortoise SVN won't commit, conflict

问题描述

我在向我的存储库提交更改时删除了一个文件夹，从而产生了冲突，现在文件夹上有一个不会消失的红色感叹号.我已尝试再次提交该文件夹，但出现错误:

I created a conflict by deleting a folder while committing a change to my repository, and now there's a red exclamation point over the folder that won't go away. I've tried committing the folder again, but I get an error:

提交失败(详情如下):'W:\LDraw\datsville\svn\trunk\povray\New folder' 计划添加，但不见了

Commit failed (details follow): 'W:\LDraw\datsville\svn\trunk\povray\New folder' is scheduled for addition, but is missing

我该如何调整?

推荐答案

如果您使用的是 Tortoise SVN，请右键单击丢失的文件/文件夹并选择 Revert...
这将恢复您所做的更改(取消删除文件夹)，以便您能够提交其他文件.
希望这会有所帮助.

If you're using Tortoise SVN, right click on the missing file / folder and select Revert...
This will revert the changes you made (undelete the folder) so you'll be able to commit other files.
Hope this helps.

这篇关于Tortoise SVN 不会提交，冲突的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！