Can't Update

[dwleo]

Hi,
Very new to this but getting there.
My mirror works well but I cannot seem to update to the new version.
I get the following error message:

Error: Your local changes to the following files would be overwritten by merge:
package-lock.json
Please, commit your changes or stash them before you can merge.

The thing is, I haven’t touched the file in question.
Any ideas?

• Dwleo

[meisch23]

I just moved the file into my /home/pi directory then did git pull in mm directory and once I realized it worked fine I just deleted the .json

[MichMich]

Run the following command from within the MagicMirror folder, and try again:

git reset --hard; git clean -df;

[dwleo]

@michmich Thasnks MitchMitch.
That did it.