<![CDATA[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?

]]>https://forum.magicmirror.builders/topic/10703/getting-an-error-on-updateRSS for NodeTue, 09 Jun 2026 14:33:55 GMTTue, 02 Jul 2019 15:29:02 GMT60<![CDATA[Reply to Getting an error on update on Tue, 02 Jul 2019 17:42:29 GMT]]>I just removed those files out of MagicMirror by adding them to the desktop and ran the commands with no issue as well.

]]>https://forum.magicmirror.builders/post/58440https://forum.magicmirror.builders/post/58440Tue, 02 Jul 2019 17:42:29 GMT<![CDATA[Reply to Getting an error on update on Tue, 02 Jul 2019 16:20:56 GMT]]>@mumblebaj Thanks!

]]>https://forum.magicmirror.builders/post/58437https://forum.magicmirror.builders/post/58437Tue, 02 Jul 2019 16:20:56 GMT<![CDATA[Reply to Getting an error on update on Tue, 02 Jul 2019 15:35:56 GMT]]>@CliffordW From within the MagicMirror folder do the following:

git reset --hard

Then do

git pull && npm install

That should solve your problem

]]>https://forum.magicmirror.builders/post/58435https://forum.magicmirror.builders/post/58435Tue, 02 Jul 2019 15:35:56 GMT