New MagicMirror Version

[ostfilinchen]

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

[NoNameRo]

@ostfilinchen

what error you get, did you run git pull && npm install

[ostfilinchen]

I only do git pull. After this I get the error.

[NoNameRo]

@ostfilinchen
what is the error after you have deleted the Readme file

try following

pm2 stop mm

then

git pull && npm install

and then

pm2 restart mm

[ostfilinchen]

@NoNameRo

Same error. I had never change the readme.md from the currentweather…

[NoNameRo]

@ostfilinchen
but you have deleted them, if not then please delete and try again

[ostfilinchen]

I don’t know what happens, but now there is no error