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

Actually, a third party analyst on which we brought, to make some improvements to our site directly to the files on the live server Decided to edit FTP Whenever we make changes to those pages through SVN, we have PHP parsing errors.

Things should be edited and committed through SVN. We have copies of the work setup so that we can edit them as they walk during the trial under the Apache, we want to see how. We send all our changes to a local repository, then comment from there on the live server.

Due to a parse error, the code on the live server >>> gt; & Gt; & Gt; & Gt; .mine and & gt; & Gt; & Gt; & Gt; & Gt; .rxxxx . How can I return the files before editing via FTP so that I can update them again via SVN?

"post-text" itemprop = "text">

Looks like you have some conflicts, can help.