2318 commits behind...

Thelonius

I was able to proceed past this error by using the command ‘git stash’. This worked for two Magic Mirrors.

CyruS1337

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?

sdetweil

you can erase those two files, then git pull again

CyruS1337

@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 :(

sdetweil

@cyrus1337

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

then

git pull

as before
then probably reinstall npm modules

from MagicMirror folder

npm install

CyruS1337

@sdetweil said in 2318 commits behind...:

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

Thank you for your quick help. Everything works :)