Download VisualSvn Server, open a command prompt and type svn resolved -R . to resolve all conflicts, then commit again.

#aside #subversion