blocks|key|1290896|text|当svn遇到冲突时会发生这种情况:您更改了一个文件，服务器上的文件被更改了，并且它不能(很容易)自动合并。You现在需要决定什么是正确的解决方案。|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|entityRanges|data|1290897|Subversion只是将diff添加到源文件中(并在源文件旁边创建文件，称为OriginalName.mine+(未更改)和OriginalName.rsomething+(未更改，服务器版本))。|1290898|修复冲突并告诉subversion这一问题已经解决。|1290899|entityMap^0|1H|3|0|0|0^^$0|@$1|2|3|4|5|6|7|L|8|@$9|M|A|N|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|O|8|@]|D|@]|E|$]]|$1|H|3|I|5|6|7|P|8|@]|D|@]|E|$]]|$1|J|3|-4|5|6|7|Q|8|@]|D|@]|E|$]]]|K|$]]

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 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.

blocks|key|1291116|text|只要删除obj文件夹，它就会正常工作。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1291117|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

just delete the obj folder and it will worked fine.

blocks|key|1290863|text|删除不应该出现在抛出错误的文件中的代码，并删除扩展名为.mine、.<somerevision>和.<some_other_revision>的三个文件。svn更新后的文件现在包含“冲突”，您需要手动解决这些冲突。通常这意味着您编辑了一个文件，其他人编辑了相同的文件并签入了更改，而您在签出已更改的文件时没有注意。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1290864|entityMap^0|Y|E|1E|L|0^^$0|@$1|2|3|4|5|6|7|H|8|@$9|I|A|J|B|C]|$9|K|A|L|B|C]]|D|@]|E|$]]|$1|F|3|-4|5|6|7|M|8|@]|D|@]|E|$]]]|G|$]]

Remove the code that shouldn't be in the file throwing the error and remove the the three files with extensions .mine, .<code>&lt;somerevision&gt;</code> and .<code>&lt;some_other_revision&gt;</code>. svn updated files that now contain 'conflicts' and you need to resolve these conflicts by hand. Usually this means you edited a file, someone else edited the same file and checked in changes and you didn't pay attention when checking out the changed file.

blocks|key|1175333|text|删除obj文件夹中的所有内容。|type|unstyled|depth|inlineStyleRanges|offset|length|style|BOLD|entityRanges|data|1175334|将obj文件夹从svn版本控制中删除。因为在每次构建时，它都会被更新，当其他开发人员提交对解决方案的更改时，SVN无法标记obj文件夹文件并引发错误。|CODE|1175335|文件具有无效的值"<<<<<<<+.mine“。路径中的非法字符。|blockquote|1175336|entityMap^0|2|6|0|1|6|8|3|0|0^^$0|@$1|2|3|4|5|6|7|N|8|@$9|O|A|P|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|Q|8|@$9|R|A|S|B|C]|$9|T|A|U|B|H]]|D|@]|E|$]]|$1|I|3|J|5|K|7|V|8|@]|D|@]|E|$]]|$1|L|3|-4|5|6|7|W|8|@]|D|@]|E|$]]]|M|$]]

Delete every thing you have in obj folder .

Remove your obj folder from <code>svn</code> version control . Because on every build it get updated and when other developer commit changes to solution SVN is unable to marge obj folder files and raise error

<blockquote>
 Files has invalid value "&lt;&lt;&lt;&lt;&lt;&lt;&lt; .mine". Illegal characters in path.
</blockquote>

blocks|key|1290915|text|请阅读颠覆书中的基本用法章节。它有一个关于手工合并冲突的章节，它解释了你看到的冲突标记。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|1290916|entityMap|0|LINK|mutability|MUTABLE|url|http://svnbook.red-bean.com/en/1.5/svn.tour.html|1|http://svnbook.red-bean.com/en/1.5/svn.tour.cycle.html#svn.tour.cycle.resolve.byhand^0|8|4|0|L|6|1|0^^$0|@$1|2|3|4|5|6|7|N|8|@]|9|@$A|O|B|P|1|Q]|$A|R|B|S|1|T]]|C|$]]|$1|D|3|-4|5|6|7|U|8|@]|9|@]|C|$]]]|E|$F|$5|G|H|I|C|$J|K]]|L|$5|G|H|I|C|$J|M]]]]

Please read the <a href="http://svnbook.red-bean.com/en/1.5/svn.tour.html" rel="noreferrer">Basic Usage</a> chapter in the subversion book. It has a section about <a href="http://svnbook.red-bean.com/en/1.5/svn.tour.cycle.html#svn.tour.cycle.resolve.byhand" rel="noreferrer">Merging conflicts by hand</a> which explains the conflict markers you're seeing.

blocks|key|1291057|text|删除为我工作的调试文件夹(请参阅注释-不是上面的回答)。在将12个文件夹从svn的一个部分移到一个新的部分后，我得到了这个结果。因此，如果您在移动一个项目之后得到这个结果，而错误并没有指向一个实际的文件，这可能是您的问题。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1291058|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

Removing the debug folders worked for me (see comment-not answer above).
I got this after moving 12 folders from one section of svn to a new section. So if you get this after moving a project and the error does not point to an actual file, this is likely your issue.

blocks|key|1175232|text|如果安装了AnkhSVN或VisualSVN，解决这个问题很可能就像右键单击解决方案资源管理器中的文件并选择编辑冲突一样容易。|type|unstyled|depth|inlineStyleRanges|entityRanges|offset|length|data|1175233|这将在合并编辑器中打开已更改的文件。(参见Tools->Options->Source+>Subversion+User+tools+for+AnkhSVN)。有了一个很好的合并工具，比如免费使用SourceGear+DiffMerge或TortoiseMerge，解决冲突只需要几个鼠标。|1175234|entityMap|0|LINK|mutability|MUTABLE|url|http://ankhsvn.net/|1|http://visualsvn.com/|2|http://www.sourcegear.com/diffmerge/^0|5|7|0|D|9|1|0|2Q|K|2|0^^$0|@$1|2|3|4|5|6|7|R|8|@]|9|@$A|S|B|T|1|U]|$A|V|B|W|1|X]]|C|$]]|$1|D|3|E|5|6|7|Y|8|@]|9|@$A|Z|B|10|1|11]]|C|$]]|$1|F|3|-4|5|6|7|12|8|@]|9|@]|C|$]]]|G|$H|$5|I|J|K|C|$L|M]]|N|$5|I|J|K|C|$L|O]]|P|$5|I|J|K|C|$L|Q]]]]

If you have <a href="http://ankhsvn.net" rel="nofollow noreferrer">AnkhSVN</a> or <a href="http://visualsvn.com" rel="nofollow noreferrer">VisualSVN</a> installed resolving this is most likely as easy as right clicking the file in the solution explorer and selecting edit conflict.

This will open the changed file in your merge editor. (See Tools->Options->Source Control->Subversion User tools for AnkhSVN). With a good merge tool like the free to use <a href="http://www.sourcegear.com/diffmerge/" rel="nofollow noreferrer">SourceGear DiffMerge</a> or TortoiseMerge, resolving the conflict is just a few mouseclicks away.

blocks|key|1291007|text|我经历过大规模的这种情况，在这种情况下，文件被标记出来，但是冲突元数据仍然存在。我为visual+studio编写了一个正则表达式来查找这些文件，对于那些不可能简单地还原更改过的文件的情况，我编写了一个正则表达式。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1291008|http://www.codetunnel.com/blog/post/90/ever-merge-with-svn-and-mess-up-when-resolving-conflicts-read-on|offset|length|1291009|entityMap|0|LINK|mutability|MUTABLE|url^0|0|0|2V|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|N|8|@]|9|@$D|O|E|P|1|Q]]|A|$]]|$1|F|3|-4|5|6|7|R|8|@]|9|@]|A|$]]]|G|$H|$5|I|J|K|A|$L|C]]]]

I have had this happen on a large scale where the files get marked resolved but the conflict metadata is still there. I wrote a regular expression for visual studio to find these, for instances where it is not feasible to simply revert the changed files.

<a href="http://www.codetunnel.com/blog/post/90/ever-merge-with-svn-and-mess-up-when-resolving-conflicts-read-on" rel="nofollow">http://www.codetunnel.com/blog/post/90/ever-merge-with-svn-and-mess-up-when-resolving-conflicts-read-on</a>

blocks|key|1291094|text|我关闭了IDE，然后删除obj文件夹，重新启动IDE并重新构建我的代码。这对我有用。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1291095|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

I closed the IDE, then deleted the obj folder and restarted the IDE and rebuilt my Code. This worked for me.

blocks|key|1175320|text|在您的项目中：
odj+folder+->+Debug+->+project+name.csproj.Filelistabsolute.txt(snb.csproj.Filelistabsolute.txt)|type|unordered-list-item|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1175321|在文本文件中出现>>>>>>>.mine和>>>>>>>.r150，以删除程序工作的内容。|1175322|unstyled|entityMap^0|8|2O|0|8|C|L|C|0^^$0|@$1|2|3|4|5|6|7|K|8|@$9|L|A|M|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|N|8|@$9|O|A|P|B|C]|$9|Q|A|R|B|C]]|D|@]|E|$]]|$1|H|3|-4|5|I|7|S|8|@]|D|@]|E|$]]]|J|$]]

<ul>
<li>Inside your project : 

<code>odj folder -&gt; Debug -&gt; project name.csproj.Filelistabsolute.txt(snb.csproj.Filelistabsolute.txt)</code></li>
<li>Inside the text file 
<code>&gt;&gt;&gt;&gt;&gt;&gt;&gt;.mine</code> and <code>&gt;&gt;&gt;&gt;&gt;&gt;&gt;.r150</code> occurs 
to remove the things the program works</li>
</ul>

blocks|key|2813929|text|1)只要保存您在文件中编辑的本地更改即可。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2813930|2)还原文件|2813931|3)从SVN更新|2813932|4)粘贴本地更改|2813933|entityMap^0|0|0|0|0^^$0|@$1|2|3|4|5|6|7|J|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|K|8|@]|9|@]|A|$]]|$1|D|3|E|5|6|7|L|8|@]|9|@]|A|$]]|$1|F|3|G|5|6|7|M|8|@]|9|@]|A|$]]|$1|H|3|-4|5|6|7|N|8|@]|9|@]|A|$]]]|I|$]]

1)Just save your local changes whatever u have edited in the file

2)revert the file

3)update it from SVN

4)Paste your local changes

blocks|key|1175338|text|如果您使用的是TortoiseSVN，那么在名为“编辑冲突”的文件上应该有一个右键单击选项。这应该会打开TortoiseMerge，它能够读取文件中的那些讨厌的符号(真的，破坏您的代码，这样您就可以知道有问题了，并且不要盲目地签入)。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|1175339|TortoiseMerge将正确地阅读它，并向您提供一个3路合并。这就是我要找的。虽然它确实也创建了独立的.mine、.rxxx和.ryyy文件，并且有各种手动和命令行方式来处理这些问题。|1175340|entityMap^0|0|0^^$0|@$1|2|3|4|5|6|7|F|8|@]|9|@]|A|$]]|$1|B|3|C|5|6|7|G|8|@]|9|@]|A|$]]|$1|D|3|-4|5|6|7|H|8|@]|9|@]|A|$]]]|E|$]]

If you are using TortoiseSVN you should have a right click option on the file called Edit Conflicts. This should bring up TortoiseMerge which is able to read those obnoxious notations stuck into the file (really, to break your code so you KNOW there's an issue and don't blindly check it in). 

TortoiseMerge will read it properly and present you with a 3-way merge. This was what I was looking for. Although it is true that it does also create the separate .mine and .rxxx and .ryyy files, and there are various manual and command-line ways to deal with all this.

blocks|key|2813978|text|有一个简单的解决方案。只需从调试文件夹中删除所有文件并重新生成解决方案，屏幕上就会显示错误“生成错误。是否继续并运行上次成功构建?单击”是“按钮。现在停止程序并正常运行。|type|unstyled|depth|inlineStyleRanges|entityRanges|data|2813979|entityMap^0|0^^$0|@$1|2|3|4|5|6|7|D|8|@]|9|@]|A|$]]|$1|B|3|-4|5|6|7|E|8|@]|9|@]|A|$]]]|C|$]]

Have a simple solution. just delete all file from debug folder and rebuild the solution, an error display on the screen &quot;There were build errors. Would you like to continue and run the last successful build? click on &quot;Yes&quot; button. Now stop the program and run normally.

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:

<blockquote>
 Files has invalid value "&lt;&lt;&lt;&lt;&lt;&lt;&lt;
 .mine". Illegal characters in path.
</blockquote>

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

SVN keeps corrupting files with "<<<<<<< .mine", how to fix?

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

教程

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云智能顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

EdgeOne AI 安全实战专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

聚焦“写作效率、视觉美观与运行性能”三方面进行全面升级，为您提供更高效、稳定的创作环境

社区富文本&Markdown编辑器全新改版上线，欢迎大家体验!

诚挚邀请您参与本次调研，分享您的真实使用感受与建议。您的反馈至关重要，感谢您的支持与参与！

社区新版编辑器体验调研

我有一个Visual C#项目，它在版本控制(SVN)下。我一直没有遇到任何问题就对这个项目进行了详细的介绍和更新。但是几个小时前，当我试图启动/重新构建项目时，Visual会引发以下错误：文件具有无效的值"<<<<<<< .mine“。路径中的非法字符。我不知道怎么解决这个问题。我该怎么办？

问SVN总是用"<<<<<<< .mine“来破坏文件，如何修复？
EN

回答 13

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问SVN总是用"<<<<<<< .mine“来破坏文件，如何修复？EN

回答 13

Stack Overflow用户

Stack Overflow用户

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问SVN总是用"<<<<<<< .mine“来破坏文件，如何修复？
EN