Read the statement by Michael Teeuw here.
Error on Updating to v2.6.0
-
Keep getting this error…running node 9.11.2
pi@raspberrypi:~/MagicMirror $ git pull && npm install
Updating 6db61b4…de57daa
error: Your local changes to the following files would be overwritten by merge:
package-lock.json
vendor/package-lock.json
Please commit your changes or stash them before you merge.
Aborting -
Erase both lock files, and go again
-
@sdetweil that worked thank you sir!
-
thanks a lot :) working for me
Hello! It looks like you're interested in this conversation, but you don't have an account yet.
Getting fed up of having to scroll through the same posts each visit? When you register for an account, you'll always come back to exactly where you were before, and choose to be notified of new replies (either via email, or push notification). You'll also be able to save bookmarks and upvote posts to show your appreciation to other community members.
With your input, this post could be even better 💗
Register Login