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:
Please, commit your changes or stash them before you can merge.
The thing is, I haven’t touched the file in question.
I just moved the file into my /home/pi directory then did
git pullin mm directory and once I realized it worked fine I just deleted the .json
Run the following command from within the MagicMirror folder, and try again:
git reset --hard; git clean -df;
@michmich Thasnks MitchMitch.
That did it.