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

just delete the obj folder and it will worked fine.