MagicMirror² v2.14.0 is available! For more information about this release, check out this topic.
Getting an error on update
-
I enter
git pull && npm install
I am seeing this error:
error: Your local changes to the following files would be overwritten by merge:
package-lock.json
package.jso
Please commit your changes or stash them before you merge.I am a noob with git. What should I do to complete the update?
-
@CliffordW From within the MagicMirror folder do the following:
git reset --hard
Then do
git pull && npm install
That should solve your problem
-
@mumblebaj Thanks!
-
I just removed those files out of MagicMirror by adding them to the desktop and ran the commands with no issue as well.