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

yawns

At least there is a single comma missing after the closing ] of your calendars entry

Richard238

@yawns Brilliant! A comma after each of the ] seems to have fixed it.

Thank you.

Richard238

		module: 'calendar',
		header: 'Calendar',



		module: 'calendar',
		header: 'Binday',

With two calendars, how do I get different icons / icon colours again in custom.css?

 .calendar .fa.fa-calendar-check-o {
  color: #00d2FF /* 55=Green FF=Blue*/
}

 .calendar .fa.fa-trash-o  {
  color: #C97F7F; /* Brown */
 }

strawberry 3.141

@Richard238 you can use the module identifier for it as it is unique

#module_7_calendar .fa.fa-calendar-check-o {

}

#module_8_calendar .fa.fa-calendar-check-o {

}

the number is the index of the entry in your config starting at 0

e.g.

modules: [
  {module: "A", position: "top_right"}, //index: 0
  {module: "B", position: "top_right"}, //index: 1
  {module: "calendar", position: "top_right"}, //index: 2
  ...
]

Richard238

Ok, like this?

modules: [
		{
			module: 'alert',   # Module 0
		},
		
        {
           module: "MMM-MyTemps",  # Module 1
            header: "Home Sensors",
            position: "bottom_right",
            config: {
                host: "192.168.1.41",
                path: "/temp2mcf.php?format=json",
                reloadInterval: 2 * 1000   //2 seconds
            }
    	},		
			
		{
			module: "updatenotification",  # Module 2
			position: "top_bar"
		},
		{
			module: 'clock',   # Module 3
			position: 'top_left'
		},
		{
			module: 'calendar',  # Module 4

. … …And second calendar = # Module 5
making the custom.css look like this:

 #module_4_calendar .fa.fa-calendar-check-o {
  color: #00d2FF /* 55=Green FF=Blue*/
}

  #module_5_calendar  .fa.fa-trash-o  {
  color: #C97F7F; /* Brown */
 }

strawberry 3.141

@Richard238 yes this should colorize the calendar icon fa-calendar-check-o in your first instance and fa-trash-o in your second.

Richard238

This post is deleted!

strawberry 3.141

@Richard238 check the part between calendar and compliments module

Richard238

@strawberry-3.141 I’ve no idea what I’m looking for, sorry…

Richard238

Just tried the default sample config.js, and that doesn’t work either!

strawberry 3.141

@Richard238 you pasted the start function into your config file, but if the config sample doesnt work either your problem is somewhere else

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?