Update magic mirror error

StewartBaird86

Trying to run the update but get the following 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

I have only edited my config.js and cloned modules to module folder.

Tried the following commands and got same error

Git pull

Git pull && npm install

sdetweil

@StewartBaird86 yeh, what a apin

run my update script see
https://github.com/sdetweil/MagicMirror_scripts

read the readme for the 2 commands u will have to issue

it will tell u you don’t need to save the package-lock.json files

StewartBaird86

@sdetweil I am doing this remotely on a laptop. I am also a noob to all of this and don’t understand the bash portion.
I have typed your script in using brackets, quotations etc and nothing happens in my terminal.
what are the steps to execute the scripts

sdetweil

@StewartBaird86 you just cut/paste the whole line… nothing to think about

what do you mean ‘remotely’… via ssh??

just paste the line into the ssh session window

this is the test run command

bash -c "$(curl -sL https://raw.githubusercontent.com/sdetweil/MagicMirror_scripts/master/upgrade-script.sh)"

if all looks good, then u would execute this command

bash -c "$(curl -sL https://raw.githubusercontent.com/sdetweil/MagicMirror_scripts/master/upgrade-script.sh)" apply