SVN files edited thru FTP, How do I fix the edited files so they work thru SVN again?

Question

Basically, a 3rd party analyst we brought on to make some improvements to our site decided to edit files directly on the live server threw FTP. Any time we make changes to those pages threw SVN we have PHP parse errors.

Things should be edited threw the SVN and committed. We have our working copies setup so we can edit them how ever we want while having them running under apache for testing. We commit all of our changes to a local repository, then commit from there to the live server.

The code on the live server that causes the parse error has ">>>>> .mine" and ">>>>> .rxxxx", and my question is, how can I revert those files back to before they were edited thru FTP so I can update them threw SVN again?

Answer 1

The easiest way is just to delete everything and check out a fresh copy.

Answer 2

Sounds like you have some conflicts, this site may help.

Answer 3

Did you try a svn revert on you server working copy?

svn revert -R