Read the statement by Michael Teeuw here.
New MagicMirror Version
-
Hi all,
If I try tu update via git pull, I get this error Message:
pi@raspberrypi:~/MagicMirror $ git pull
Entferne tests/unit/translations/same_keys.js
Entferne tests/unit/functions/class_spec.js
automatischer Merge von modules/default/currentweather/README.md
KONFLIKT (Inhalt): Merge-Konflikt in modules/default/currentweather/README.mdAutomatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen Sie dann das Ergebnis.I have deleted the Readme file and also do git reset --hard. But nothing helps.
What can I do to solve the Problem?
Regards
Daniel -
what error you get, did you run git pull && npm install
-
I only do git pull. After this I get the error.
-
@ostfilinchen
what is the error after you have deleted the Readme filetry following
pm2 stop mmthen
git pull && npm installand then
pm2 restart mm -
-
@ostfilinchen
but you have deleted them, if not then please delete and try again -
I don’t know what happens, but now there is no error
Hello! It looks like you're interested in this conversation, but you don't have an account yet.
Getting fed up of having to scroll through the same posts each visit? When you register for an account, you'll always come back to exactly where you were before, and choose to be notified of new replies (either via email, or push notification). You'll also be able to save bookmarks and upvote posts to show your appreciation to other community members.
With your input, this post could be even better 💗
Register Login