UNSOLVED Unable to upgrade MM to 2.27.1
Johanba last edited by
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
cd ~/MagicMirror git reset --hard HEAD git pull npm install
why unmerged files?
to see what is going on