conflicted files in Subversion merges

If you just open the file you'll see some markup added to the bit Subversion couldn't make sense of. It will look like so:

<<<<<<< .mine
   foo = bar;
=======
   foo = baz;
>>>>>>> .r57978

 
 

I recommend just getting on the other side of TortoiseSVN's process (don't try to clean this up in Tortoise) and then manually fix things in Visual Studio. Manually delete the goofy extra files that Subversion made right next to the conflicted file in the same folder and then commit your change. The state should flip back to green. Don't expect Subversion's clean up commands to help you.