2318 commits behind...

[savona]

I recently installed MM with docker using this image:

https://github.com/bastilimbach/docker-MagicMirror

It ran fine for a couple of days then yesterday I received this meesage:

MagicMirror2 update available.
The current installation is 2318 commits behind on the master branch.

My current version is:

grep version package.json 
"version": "2.5.0"

I have done a lot of searching. I have read that there is a cron job that updates the image for docker, but I have rebuilt several times and still no luck and I don’t see any changes on the docker git.

I have tried git pull and get error after error.

error: Your local changes to the following files would be overwritten by merge:
	package-lock.json
	vendor/package-lock.json
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
	modules/default/clock/clock_screenshot.png
	modules/default/compliments/compliments_screenshot.png
	modules/default/currentweather/weather_screenshot.png
	modules/default/newsfeed/newsfeed_screenshot.png
	modules/default/weather/README.md
	modules/default/weather/current.njk
	modules/default/weather/current.png
	modules/default/weather/forecast.njk
	modules/default/weather/forecast.png
	modules/default/weather/providers/README.md
	modules/default/weather/providers/darksky.js
	modules/default/weather/providers/openweathermap.js
	modules/default/weather/weather.css
	modules/default/weather/weather.js
	modules/default/weather/weatherobject.js
	modules/default/weather/weatherprovider.js
	modules/default/weatherforecast/forecast_screenshot.png
Please move or remove them before you merge.
Aborting

Any help?

[dazza120]

@savona rename those folders then got pull, then you can delete once MM is working on the new version

[savona]

@dazza120 But then if I rebuild the docker container wouldn’t it just put me back 2318 commits?

UPDATE: Yes, I rebuilt the docker container and it reverted right back.

[savona]

@bastilimbach Any help?

[bhepler]

@savona - Would it make sense to build from image, rename the git files, pull, update and then upload the fixed image as a PR?

[savona]

@bhepler maybe.

but I saw that the originator of the docker image said it was updated daily with a cronjob on this post:

https://forum.magicmirror.builders/topic/5316/automatic-docker-build/2

[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

[CyruS1337]

@sdetweil said in 2318 commits behind...:

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

Thank you for your quick help. Everything works :)