Tx Trystan,…Got there with a few additions,…
to complete update I needed to
cd /var/www/emoncms/Modules/feed/engine
followed by:-
git config pull.rebase false
git pull
git stash
git config pull.rebase false
git pull
git stash apply ;to write back updates
Initially the git pulls were failing as follows:-
pi@emonpi:/var/www/emoncms/Modules/feed/engine $ git pull
remote: Enumerating objects: 2808, done.
remote: Counting objects: 100% (951/951), done.
remote: Compressing objects: 100% (394/394), done.
remote: Total 2808 (delta 632), reused 617 (delta 556), pack-reused 1857 (from 3)
Receiving objects: 100% (2808/2808), 1.73 MiB | 9.83 MiB/s, done.
Resolving deltas: 100% (1831/1831), completed with 28 local objects.
From https://github.com/emoncms/emoncms
c9372000..69084f2d stable -> origin/stable
* [new branch] copilot/add-pwa-support -> origin/copilot/add-pwa-support
fcfe0d66..63d55d61 master -> origin/master
* [new branch] serial_config_is_running -> origin/serial_config_is_running
* [new branch] sync_feed_list_integration -> origin/sync_feed_list_integration
* [new branch] v12 -> origin/v12
* [new branch] v12_input_and_feed_lists -> origin/v12_input_and_feed_lists
* [new tag] 11.13.2 -> 11.13.2
* [new tag] 11.15.15 -> 11.15.15
* [new tag] 11.10.1 -> 11.10.1
* [new tag] 11.10.2 -> 11.10.2
* [new tag] 11.10.3 -> 11.10.3
* [new tag] 11.10.4 -> 11.10.4
* [new tag] 11.10.5 -> 11.10.5
* [new tag] 11.11.0 -> 11.11.0
* [new tag] 11.11.1 -> 11.11.1
* [new tag] 11.11.2 -> 11.11.2
* [new tag] 11.12.1 -> 11.12.1
* [new tag] 11.12.2 -> 11.12.2
* [new tag] 11.12.3 -> 11.12.3
* [new tag] 11.12.4 -> 11.12.4
* [new tag] 11.13.0 -> 11.13.0
* [new tag] 11.13.1 -> 11.13.1
* [new tag] 11.13.3 -> 11.13.3
* [new tag] 11.13.4 -> 11.13.4
* [new tag] 11.15.10 -> 11.15.10
* [new tag] 11.15.11 -> 11.15.11
* [new tag] 11.15.12 -> 11.15.12
* [new tag] 11.15.13 -> 11.15.13
* [new tag] 11.15.14 -> 11.15.14
* [new tag] 11.15.6 -> 11.15.6
* [new tag] 11.15.7 -> 11.15.7
* [new tag] 11.15.8 -> 11.15.8
* [new tag] 11.15.9 -> 11.15.9
* [new tag] 11.9.10 -> 11.9.10
* [new tag] 11.9.13 -> 11.9.13
* [new tag] 11.9.8 -> 11.9.8
Updating fcfe0d66..69084f2d
error: Your local changes to the following files would be overwritten by merge:
Modules/feed/engine/PHPFina.php
Please commit your changes or stash them before you merge.
Aborting
hence I injected the git stash,.. which seems to have saved my edits…
and an additional
git config pull.rebase false
git pull
and :-
git stash apply ; to write back updates
The final git pull then seems to update all of the components, with a whole load of php js css json files being update in the blink of an eye… followed by the git stash apply
on refreshing the emonpi components screen,.. emoncms core is at 11.15.15
And the graph interface has a whole new look and feel…
what new toys are here,.. I will explore..
How do I maintain future updates,.. is it essentially as I have discovered above,.. or can it be automated,.. I only ask,… as my git experience is very limited..
Many tx for your help Trystan