2318 commits behind...

idoodler

@savona Both package-lock.json can just be deleted. Did you intentionally change the files in the default directory?

savona

@idoodler No I did not change the default directory at all. That is why this is so odd to me.

rummyr

I got a message saying my MM was out of date, so I pulled the new docker image and now have the 2318 message also.

The top of my CHANGELOG.md reads “## [2.5.0] - 2018-10-01”
Though the “image date” as reported by Portainer is “Created 2019-01-01 15:08:22”

Do we need to wait for bastilimbach?

idoodler

@savona OK, you may have a corrupt git directory then. You may try to clone it again.

savona

I just blew away the docker image and did a new pull and it is fixed and on 2.6.0.

grep version package.json

“version”: “2.6.0”,

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