pi@raspberrypi:~/MagicMirror $ git -c user.name=upgrade_script -c user.email=script@upgrade.com stash
Saved working directory and index state WIP on master: a31546b Merge pull request #1717 from MichMich/develop
pi@raspberrypi:~/MagicMirror $ git stash show
installers/mm.sh | 2 ±
modules/default/calendar/calendar.js | 4 ±
modules/default/currentweather/currentweather.js | 2 ±
modules/default/weather/weather.js | 2 ±
modules/default/weatherforecast/weatherforecast.js | 2 ±
package-lock.json | 799 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++±-------------------------------------------------
run-start.sh | 4 ±
7 files changed, 442 insertions(+), 373 deletions(-)

@sdetweil English is not my native language … sorry but I did not quite understand what to do

pi@raspberrypi:~/MagicMirror $ git merge-tree ~ git merge-base master HEAD ~ HEAD master
usage: git merge-tree
pi@raspberrypi:~/MagicMirror $ git stash show
No stash entries found.
pi@raspberrypi:~/MagicMirror $ git stash

*** Please tell me who you are.

Run

git config --global user.email “you@example.com”
git config --global user.name “Your Name”

to set your account’s default identity.
Omit --global to set the identity only in this repository.

fatal: unable to auto-detect email address (got ‘pi@raspberrypi.(none)’)
Cannot save the current index state
pi@raspberrypi:~/MagicMirror $ git pull
Updating a31546b…500147e
error: Your local changes to the following files would be overwritten by merge:
modules/default/currentweather/currentweather.js
modules/default/weather/weather.js
modules/default/weatherforecast/weatherforecast.js
package-lock.json
run-start.sh
Please commit your changes or stash them before you merge.
Aborting
pi@raspberrypi:~/MagicMirror $

@sdetweil said in new update/upgrade script, ready for testing:

git pull

pi@raspberrypi:~ $ cd ~/MagicMirror
pi@raspberrypi:~/MagicMirror $ git merge-tree git merge-base master HEAD HEAD master
pi@raspberrypi:~/MagicMirror $ git pull
Updating a31546b…500147e
error: Your local changes to the following files would be overwritten by merge:
modules/default/currentweather/currentweather.js
modules/default/weather/weather.js
modules/default/weatherforecast/weatherforecast.js
package-lock.json
run-start.sh
Please commit your changes or stash them before you merge.
Aborting
pi@raspberrypi:~/MagicMirror $

no change … I’m a simple user so don’t judge strictly

Upgrade started - Sun Oct 6 11:26:51 +05 2019
user requested to apply changes
doing test run = false

saving custom.css
remote name = origin
upgrading from version 2.8.0 to 2.9.0
fetching latest revisions
current branch = master
there are 7 local files that are different than the master repo

installers/mm.sh
modules/default/calendar/calendar.js
modules/default/currentweather/currentweather.js
modules/default/weather/weather.js
modules/default/weatherforecast/weatherforecast.js
package-lock.json
run-start.sh

save/restore files selection = y
test merge result rc=‘’ if empty, no conflicts
executing merge, apply specified
merge result rc= 0n Updating a31546b…500147e
updating MagicMirror runtime, please wait

magicmirror@2.8.0 install /home/pi/MagicMirror
cd vendor && npm install
npm WARN optional SKIPPING OPTIONAL DEPENDENCY: fsevents@1.2.4 (node_modules/fsevents):
npm WARN notsup SKIPPING OPTIONAL DEPENDENCY: Unsupported platform for fsevents@1.2.4: wanted {“os”:“darwin”,“arch”:“any”} (current: {“os”:“linux”,“arch”:“arm”})

audited 220 packages in 53.517s
found 5 vulnerabilities (4 low, 1 high)
run npm audit fix to fix them, or npm audit for details

magicmirror@2.8.0 postinstall /home/pi/MagicMirror
sh installers/postinstall/postinstall.sh && npm run install-fonts

^[[32mMagicMirror installation successful!

magicmirror@2.8.0 install-fonts /home/pi/MagicMirror
cd fonts && npm install

audited 1 package in 3.78s
found 0 vulnerabilities

npm WARN grunt-stylelint@0.11.1 requires a peer of stylelint@^10.0.0 but none is installed. You must install peer dependencies yourself.
audited 3573 packages in 310.648s

found 16 vulnerabilities (1 moderate, 15 high)

run npm audit fix to fix them, or npm audit for details
processing dependency changes for active modules with package.json files
processing for module MMM-WeeklySchedule please wait
audited 1 package in 3.297s
found 0 vulnerabilities
processing complete for module MMM-WeeklySchedule
processing for module MMM-MyPrayerTimes please wait
audited 3 packages in 4.211s
ound 0 vulnerabilities
processing complete for module MMM-MyPrayerTimes
restoring custom.css
we stashed a set of files that appear changed from the latest repo versions. you should review them

for some reason, it updates me to version 2.8.0, although it seems like version 2.9.0 has already been released.

MagicMirror installation successful!

magicmirror@2.8.0 install-fonts /home/pi/MagicMirror
cd fonts && npm install

I was tormented for a week with the installation on Pi zero and, to my great happiness, I found your post. Everything is working!!! Thanks a lot!!!