Trouble to uopdate MagicMirror

[shgmongohh]

Helle,
when I try to update my magic mirror with git pull
I get the following meassage:

Your local changes to the following files would be overwritten by merge:
        package-lock.json

How can I fix it?

Sebastian

[sdetweil]

@shgmongohh erase that file,(it will be recreated)

or use my upgrade script
see here https://github.com/sdetweil/MagicMirror_scripts

[shgmongohh]

@sdetweil Thanks, it worked well

[sdetweil]

@shgmongohh u had to run it twice, yes? once for test, once for actual update

[shgmongohh]

@sdetweil yes