svn 错误和解决 Files has invalid value mine （转）

在用svn时，获取服务器文件后，本地编译，报错，错误消息为“Files has invalid value "<<<<<<< .mine。。。。。”，这是由于版本合并冲突所致，

解决方法：打开解决方案下面的 <Projectname>.csproj.FileListAbsolute.txt
然后文本方式打开，找到  "<<<<<<< .mine “ 删除 即可

 

转：http://www.10ec.cn/thread-151-1-1.html

 

 

2011-01-14补充：

 

If you have AnkhSVN or VisualSVN 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 SourceGear DiffMerge or TortoiseMerge, resolving the conflict is just a few mouseclicks away.