Update started but not finished

[com1cedric]

Hello,
after using the official command to update the mirror to the latest version…
pi@raspberrypi:~/MagicMirror $ git pull && npm install --only=prod --omit=dev

… this error occurs before finishing the update:

Update 30d5bfe5…9e029304
error: Your local changes to the following files would be overwritten by the merge :
package-lock.json
package.json
Please commit or re-save your changes before the merge.
Abort
pi@raspberrypi:~/MagicMirror $

would you have an advice how to finish the install?
Thank you in advance
Cédric

[sdetweil]

@com1cedric you can erase package-lock.json, it will be rebuilt

what is the change to package.json?

do

git diff package.json

we need the new one in the update

move it out of the way

mv package.json old_package.json

then restart the update… using my script might be better

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

[com1cedric]

@sdetweil great, thank you very much ! really appreciate your help!