Parse syntax error unexpected T_SL caused by Subversion conflict

You caused a conflict in your template.php

so the status on SVN was set to "C"

apparently that means the conflict only exists in that local checkout? Did you edit directly on the server?

Anyway, whatever happened, I do SVN update on my checkout of the repository, look at line 464

as the error message is Parse error: syntax error, unexpected T_SL on line 464

and everything is fine

but if I look at the file directly on the server, even though it is up to date (but giving that C flag)

we have this:
<<<<<<< .mine
<<<<<<< .mine
}
=======
}

(actual code here)

and this:
=======
>>>>>>> .r3435
}>>>>>>> .r3431

Made a copy of my favorite version out of paranoia and put it also in the template.tpl spot, and:

sudo svn resolved template.php
Resolved conflicted state of 'template.php'

Then was able to commit.

Reference:
http://www.faqts.com/knowledge_base/view.phtml/aid/18379/fid/51
http://svnbook.red-bean.com/en/1.1/ch03s05.html

Resolution