SVN 不断破坏文件，“<<<<<<<<<<<<<<<<.mine"，如何修复? [英] SVN keeps corrupting files with "<<<<<<< .mine", how to fix?

问题描述

我有一个受版本控制 (SVN) 的 Visual Studio C# 项目.我一直在提交和更新项目，没有任何问题.但是几个小时前，当我尝试启动/重建项目时，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.

Subversion 只是将差异添加到您的源文件中(并在其旁边创建文件，称为 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)).

修复冲突并告诉 subversion 这已解决.

Fix the conflict and tell subversion that this is resolved.

这篇关于SVN 不断破坏文件，“&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;&lt;.mine"，如何修复?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！