Update says to "commit your changes or stash them before you can merge." ?

Richard238

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",],

Richard238

And suddenly it come back into life! :)

pepemujica

@yawns Hi! I’ve never change neither te default modules or the main.css. Any idea why I get the same error?

bminer1

@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

yawns

@bminer1
please run

git reset --hard
git pull
npm install

You left out the --hard option :)

rudibarani

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?