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 closed the IDE, then deleted the obj folder and restarted the IDE and rebuilt my Code. This worked for me.