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

Question

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 Visu

Answer 1

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.

http://www.codetunnel.com/blog/post/90/ever-merge-with-svn-and-mess-up-when-resolving-conflicts-read-on