Hi guy's I try to update my emoncms and now i get this error mesage
I did a $git pull origin master
Updating 8302a2f..de1a087
error: Your local changes to the following files would be overwritten by merge:
Lib/bootstrap/js/bootstrap.min.js
Modules/user/user_controller.php
Modules/vis/visualisations/bargraph.php
Modules/vis/visualisations/multigraph.php
migrate.php
Please, commit your changes or stash them before you can merge.
Aborting
and now i get this message at the browser
parse error: syntax error, unexpected '$session' (T_VARIABLE) in /var/www/emoncms/Modules/user/user_controller.php on line 243
any instructions to get it working again
thanx
Natnek
Re: PHP error message
Apparently you had local modifications. I'm surprised something changed since the git pull aborted. Weird.
Below are a few hints, but there's definitely something I don't understand. The ideal way would have been to commit your local changes (or stash them) before pulling. You didn't and the merge tool refused to proceed. See :
the following files would be overwritten by merge [...] Aborting
Question remains : why do you see any difference, then, if nothing was changed ? I don't have a clue.
Try following commands to see where you are:
git log
git status -s
git diff HEAD (or git difftool HEAD)
The latter should let you review you own changes.
Edit: I just checked on my own install.
git checkout upstream/master
error: Your local changes to the following files would be overwritten by checkout:
Modules/vis/vis_controller.php
Please, commit your changes or stash them before you can switch branches.
Aborting
My files are unchanged.
Are you sure nothing else was changed on your side ?
Re: PHP error message
Hi Jérôme
I am sure mate. I did not make any modifications.
Anyway thanks for the hints, my database was corrupted.
i did a fresh install of the latest image V5.
thanx
Natnek