Problems after updating to emoncms 10.1.13

[borpin (Brian Orpin)]

For future reference, when posting code or bash output, put in 3 ‘backticks’ (found at the top left of the keyboard normally) on a line on their own, then the code, then 3 more backticks on a line following the code.

    ```
   put your code here
    ```

If it is something like php you can add a language identifier that after the first 3 backticks so ```php

@IanDavies

git pull /home/pi/emonpi

* master
wifiap
On branch master
Your branch is behind ‘origin/master’ by 270 commits, and can be fast-forwarded.
(use “git pull” to update your local branch)
Changes not staged for commit:
(use “git add …” to update what will be committed)
(use “git checkout – …” to discard changes in working directory)

modified:   rc.local_jessieminimal

no changes added to commit (use “git add” and/or “git commit -a”)
error: Your local changes to the following files would be overwritten by merge:
rc.local_jessieminimal
Please, commit your changes or stash them before you can merge.
Aborting

Here is the first problem. This means your update script has not been updated.

I would suggest taking a backup first.

Fix the rc.local_jessieminimal issue and update.

However, this is a Jessie image, 2 releases behind the current Buster and out of support.

I strongly suggest you take a backup, get a new SD card, and import the backup.

There are system changes that mean Jessie based systems are not really supportable.