svn remove --force yourfilename
svn resolve --accept=working yourfilename
svn commit -m ""
svn remove --force yourfilename
svn resolve --accept=working yourfilename
svn commit -m ""
svn remove --force yourfilename
svn resolve --accept=working yourfilename
svn commit -m ""