This forum was moved to another machine and updated to a recent version. If you are unable to login please delete your browser cookies and cache and restart your browser.A New Chapter for MagicMirror: The Community Takes the Lead
Read the statement by Michael Teeuw here.
Read the statement by Michael Teeuw here.
Unsolved Unable to upgrade MM to 2.27.1
-
Hi
Getting this error
pi@raspberrypi:~/MagicMirror $ git pull && npm install
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use ‘git add/rm ’
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.Will appreciate any assistance
-
Try
cd ~/MagicMirror git reset --hard HEAD git pull npm install
-