After updating, I see "Parse error: syntax error, unexpected T_SL in ... framework.config.php"

If you see the following error after you update from Subversion it usually means you had a conflict:
Parse error: syntax error, unexpected T_SL in ... framework.config.php

Conflicts are a situation where both your local copy of a file and the official version of the same file have changes on the same lines.

The best way to resolve a conflict is to edit the affected file and manually merge the changes. Generally this involves choosing the changes to keep, which requires an understanding of the code.

A quick way to resolve a conflict, assuming you don't want to keep your local changes, is to revert the file. You can do this by issuing the following command:
svn revert framework.config.php

This will remove any local changes. It's important to note when doing this to your framework.config.php file that means it will remove your configuration settings. Be sure to make a copy of the file before reverting so you can replace your database connection info.

Once you've resolved the conflict you need to tell Subversion with:
svn resolved framework.config.php

Search
»

Article Tools
Print