Basically, a 3rd party analyst we brought on to make some improvements to our site decided to edit files directly on the live server through FTP. Any time we make changes to those pages through SVN, we have PHP parse errors.
Things should be edited through 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. How can I revert those files back to before they were edited through FTP so I can update them through SVN again?
Sounds like you have some conflicts, this site may help.