UNSOLVED Error while updating.

roycejp

Hi,

I’m trying to update my MagicMirror 2 using these commands:

git pull && npm install

But I get these error messages:

Updating 5bf90ae..447c0bf
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

Please advise. Thank you!

-Royce

sdetweil

@roycejp erase both files and repeat your command

cirdan

Or do ```
git stash

sdetweil

@cirdan but don’t need to stash package-lock.json for sure