little update Problem ..

[Stoffbeuteluwe]

Patricks-Mini:MagicMirror patrickhahn$ git pull && npm install
Updating a31546b…500147e
error: Your local changes to the following files would be overwritten by merge:
package-lock.json
package.json
Please commit your changes or stash them before you merge.
Aborting
Patricks-Mini:MagicMirror patrickhahn$

can anybody help me? Thanks

[sdetweil]

@Stoffbeuteluwe use my new update script

see
https://forum.magicmirror.builders/topic/10859/new-update-upgrade-script-ready-for-testing

[sdetweil]

@Stoffbeuteluwe also, do

git diff package.json

what are the differences?

[Stoffbeuteluwe]

@sdetweil Hi, the script works fine …thank you