MagicMirror² v2.14.0 is available! For more information about this release, check out this topic.
Error while updating.
-
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
-
@roycejp erase both files and repeat your command
-
Or do ```
git stash
-
@cirdan but don’t need to stash package-lock.json for sure