SVN保持与&QUOT腐败的文件;<<<<<<< .mine&QUOT ;,如何解决？ [英] SVN keeps corrupting files with "<<<<<<< .mine", how to fix?

问题描述

我有一个Visual Studio C＃项目，该项目是版本控制（SVN）下。
我一直COMMITED和更新的项目没有任何问题。但是，当我尝试启动/重建项目前的Visual Studio几个小时引发以下错误：

I've got a Visual Studio C# project which is under version control (SVN). I've always commited and updated the project without any problems. But a couple of hours ago Visual Studio throws the following error when I try to launch/rebuild the project:

文件具有无效值< ;&所述;&所述;&所述;&所述;&所述;&下;
.mine。路径中具有非法字符。

Files has invalid value "<<<<<<< .mine". Illegal characters in path.

我不知道如何解决这个问题。 ？我应该怎么办

I don't know how to fix this problem. What should I do?

推荐答案

这是发生在SVN遇到冲突：你改变了一个文件时，服务器上的文件被更改它不能（容易地）地被自动合并。 您需要决定什么是正确的解决办法了。

That happens when svn encounters a conflict: You changed a file, the file on the server was changed and it cannot (easily) be merged automatically. You need to decide what is the correct solution now.

颠覆只是增加差异到您的源文件（并创建旁边的文件，所谓OriginalName.mine（不变）和OriginalName.rsomething（不变，服务器版本））。

Subversion just adds the diff into your source file (and creates files next to it, called OriginalName.mine (unchanged) and OriginalName.rsomething (unchanged, server version)).

解决冲突，并告诉颠覆，这是的解决。

Fix the conflict and tell subversion that this is resolved.

这篇关于SVN保持与&QUOT腐败的文件;&LT;&LT;&LT;&LT;&LT;&LT;&LT; .mine&QUOT ;,如何解决？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！