Error on Updating to v2.6.0
Keep getting this error…running node 9.11.2
pi@raspberrypi:~/MagicMirror $ git pull && npm install
error: Your local changes to the following files would be overwritten by merge:
Please commit your changes or stash them before you merge.
Erase both lock files, and go again
@sdetweil that worked thank you sir!
thanks a lot working for me