@sdetweil said in 2318 commits behind...:

rm package-lock.json
rm vendor/package-lock.json

Thank you for your quick help. Everything works :)

@sdetweil said in 2318 commits behind...:

you can erase those two files, then git pull again

Ok, can you tell me how to delete and reload? Sorry, but unfortunately I do not understand so much of the matter :(

Hello everybody

I have three MagicMirrors in use. On two mirrors he shows me that I’m 2318 and 124 behind the master respectively.

If I enter git pull in the MagicMirror folder, error occurs

Aktualisiere 6db61b4..de57daa
error: Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge
überschrieben werden:
        package-lock.json
        vendor/package-lock.json
Bitte committen oder stashen Sie Ihre Änderungen, bevor sie mergen.
Abbruch

What do I have to do to bring the MagicMirror up to date?

Wooow great work !!!

n268 Zuerich, Switzerland

is it also possible to turn off the monitor?

@barnosch Vielen Dank! Ich werde meinen PIR Sensor nach dieser Anleitung diese Wochenende einmal testen.

@michimauch, Danke für den Hinweis.

Looks great! What did you take between the monitor and the frame? A black plate or a cloth?

@barnosch Meinst du also nicht das -> https://forum.magicmirror.builders/topic/6291/howto-turn-on-off-your-monitor-time-based-pir-button-app/6

Welches meinst du dann?