Trying to update to version 2.25

[vandam3b]

Hi, I am trying to update to version 2.25. I am not a coder by any stretch. I typed this in (git pull && npm run install-mm) and received this message:
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace “git config” with “git config --global” to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
Updating e87f50e6…343e7de7
error: Your local changes to the following files would be overwritten by merge:
package-lock.json
Please commit your changes or stash them before you merge.
Aborting

Any help would be appreciated. Thank you.

[vandam3b]

Hi, I just wanted to let you know. I used your script to reinstall and all went well. Thanks again.

[sdetweil]

@vandam3b how did you install mm?

manual or with my script?
see
https://github.com/sdetweil/MagicMirror_scripts

[vandam3b]

Hi, I installed it manually.

[sdetweil]

@vandam3b rename the MagicMirror folder to some other name

and then run my install script.

I don’t know why your git config has this problem

or maybe restore this file
package-lock.json

git checkout package-lock.json

[vandam3b]

I will give it a try. Thank you very much.

[vandam3b]

@vandam3b
Hi, I installed your scripts and now get this when I try to run MagicMirror with npm start.

magicmirror@2.25.0 start
DISPLAY=“${DISPLAY:=:0}” ./node_modules/.bin/electron js/electron.js

sh: 1: ./node_modules/.bin/electron: not found
Any help would be appreciated. Thank you.

[sdetweil]

@vandam3b what platform is this?
can u send me the ~/install.log to my email
same userid at gmail

try this too

cd ~/MagicMirror
npm install electron@26.2.4

then if its sucessful
npm start

[vandam3b]

Hi, I tried it but I still got the same error. I don’t know where to find the install.log. I appreciate your help and do not want to take any more of your time. I will just uninstall everything and then start from scratch. Thanks again.

[sdetweil]

@vandam3b use my install script after u flash the SD card again

see
https://github.com/sdetweil/MagicMirror_scripts/tree/master

[vandam3b]

I will. Thanks