简体繁体 English

SVN-无法解决冲突

[英]SVN - cannot resolve conflict

原文 2013-09-06 23:43:36 3 1 svn/ tortoisesvn

I have used SVN a lot but I haven't created my own SVN server from scratch before. 我已经使用了SVN了很多，但是之前从未从头创建过自己的SVN服务器。 I have created it, and all seems well. 我创建了它，一切似乎都很好。 Except that I must have skipped some step before I made the dreadful mistake of changing a line of code in 1 of my files. 除了在更改其中一个文件中的一行代码这一可怕的错误之前，我必须跳过一些步骤。 Now, I cannot do a successful UPDATE from the server. 现在，我无法从服务器成功执行UPDATE。 I continuously get the error message shown in the screenshot: 我不断收到屏幕截图中显示的错误消息：

在此处输入图片说明

There is 1 file conflicted in the "Scripts" folder. “脚本”文件夹中有1个文件冲突。 I have tried seemingly everything. 我似乎已经尝试了一切。 I tried reverting it. 我尝试还原它。 Tried committing it (seems to always work!) I tried deleting it and re-updating from server. 尝试提交（似乎总是可以使用！），我尝试将其删除并从服务器重新更新。 That worked. 那行得通。 But when I try to update from the root, I always get the error shown below. 但是，当我尝试从根目录进行更新时，总是会显示以下错误。 This is Tortoise SVN. 这是Tortoise SVN。

I'm missing some simple step. 我缺少一些简单的步骤。 Please help. 请帮忙。

1 个解决方案

See the answer TortoiseSVN reports conflict, but no conflict can be found to a similar question. 请参阅答案TortoiseSVN报告冲突，但是找不到类似问题的冲突。 The reason could be that you have changed the script folder on the server (lowercase to uppercase or vice versae), and your operating system (Windows) is not able to have both Script with uppercase and script with lowercase. 原因可能是您已更改服务器上的脚本文件夹（从小写改为大写，反之亦然），并且操作系统（Windows）不能同时具有大写的Script和小写的script 。 A fresh checkout cannot have the effect you describe. 重新签出不能达到您描述的效果。