Read the statement by Michael Teeuw here.
Update says to "commit your changes or stash them before you can merge." ?
-
@Richard238 check the part between calendar and compliments module
-
@strawberry-3.141 I’ve no idea what I’m looking for, sorry…
-
Just tried the default sample config.js, and that doesn’t work either!
-
@Richard238 you pasted the start function into your config file, but if the config sample doesnt work either your problem is somewhere else
-
Powered off & on, default config OK, and mine too.
But, cannot see Mirror from PC, despite full whitelisting in config.
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1", "::ffff:192.168.1.1/120",], -
And suddenly it come back into life! :)
-
@yawns Hi! I’ve never change neither te default modules or the main.css. Any idea why I get the same error?
-
@yawns I dont know what im doing wrong. Trying to follow your Option 2.
pi@raspberrypi:~/MagicMirror $ git reset Unstaged changes after reset: M css/custom.css M modules/default/alert/alert.js M modules/default/calendar/calendar.css M modules/default/calendar/calendar.js M modules/default/currentweather/currentweather.js M modules/default/weatherforecast/weatherforecast.js pi@raspberrypi:~/MagicMirror $ git pull Updating 8010e62..5c41e24 error: Your local changes to the following files would be overwritten by merge: modules/default/calendar/calendar.js modules/default/currentweather/currentweather.js modules/default/weatherforecast/weatherforecast.js Please, commit your changes or stash them before you can merge. Aborting -
-
I am trying to update my Docker version to 2.5.0. Do I need to update the Docker image itself or can I just use the regular update path?
I keep getting the error to commit or stash my changes. Doing so does not change a thing:
root@magic_mirror:/opt/magic_mirror# git reset --hard && git pull HEAD is now at 6aa156d Merge pull request #1343 from MichMich/develop Updating 6aa156d..6db61b4 error: Your local changes to the following files would be overwritten by merge: config/config.js.sample css/main.css modules/default/alert/alert.js modules/default/calendar/calendarfetcher.js modules/default/compliments/README.md modules/default/compliments/compliments.js modules/default/newsfeed/README.md modules/default/newsfeed/newsfeed.js modules/default/updatenotification/updatenotification.js modules/default/weatherforecast/weatherforecast.js Please, commit your changes or stash them before you can merge. Aborting ``` Stashing the changes does not help either. Does someone have an idea?
Hello! It looks like you're interested in this conversation, but you don't have an account yet.
Getting fed up of having to scroll through the same posts each visit? When you register for an account, you'll always come back to exactly where you were before, and choose to be notified of new replies (either via email, or push notification). You'll also be able to save bookmarks and upvote posts to show your appreciation to other community members.
With your input, this post could be even better 💗
Register Login