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?