MagicMirror Forum
    • Recent
    • Tags
    • Unsolved
    • Solved
    • MagicMirror² Repository
    • Documentation
    • 3rd-Party-Modules
    • Donate
    • Discord
    • Register
    • Login
    A New Chapter for MagicMirror: The Community Takes the Lead
    Read the statement by Michael Teeuw here.

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

    Scheduled Pinned Locked Moved Troubleshooting
    26 Posts 8 Posters 41.0k Views 8 Watching
    Loading More Posts
    • Oldest to Newest
    • Newest to Oldest
    • Most Votes
    Reply
    • Reply as topic
    Log in to reply
    This topic has been deleted. Only users with topic management privileges can see it.
    • R Offline
      Richard238
      last edited by yawns

      pi@raspberrypi:~/MagicMirror $ git pull && npm install
      Updating 8010e62..1a2b4f8
      error: Your local changes to the following files would be overwritten by merge:
              css/main.css
              modules/default/calendar/calendar.js
              modules/default/compliments/compliments.js
              modules/default/newsfeed/newsfeed.js
              modules/default/weatherforecast/weatherforecast.js
      Please, commit your changes or stash them before you can merge.
      Aborting
      

      How do I do this, please?

      B 1 Reply Last reply Reply Quote 0
      • B Offline
        bluecaka69 @Richard238
        last edited by

        @Richard238 following have the same issues

        1 Reply Last reply Reply Quote 0
        • yawnsY Offline
          yawns Moderator
          last edited by

          This is why you should not modify the default modules and css/main.css … treat them as “system files” and don’t touch.

          Option 1 - save your changes, remove them temporary to do the update and apply them afterwards
          Risk is, that your own changes could interfere with changes provided by the update.

          git stash
          git pull
          git stash pop
          npm install
          

          Option 2 - remove all changes

          git reset --hard
          git pull
          npm install
          
          R P B 3 Replies Last reply Reply Quote 1
          • R Offline
            Richard238 @yawns
            last edited by

            @yawns
            I don’t quite understand.

            Main.css - I don’t know what I’ve changed, I’ll have a look later.
            compliments.js Well, OK, I can re-write those.

            calendar.js / newsfeed.js / weatherforecast.js
            These have to be changed to pull in your calendar, your choice of news, your choice of weather, don’t they?

            yawnsY 1 Reply Last reply Reply Quote 0
            • yawnsY Offline
              yawns Moderator @Richard238
              last edited by

              @Richard238

              No, there is no need at all to change these files.

              next to main.css you find custom.css, there you can add any css styles which will override existing styles.

              To add compliments, calendars, newsfeeds and forecast you set your values in config/config.js.
              This way you don’t lose your changes :)

              R 1 Reply Last reply Reply Quote 1
              • R Offline
                Richard238 @yawns
                last edited by

                @yawns Ok, thanks. I’ve some work to do there then!

                1 Reply Last reply Reply Quote 0
                • R Offline
                  Richard238
                  last edited by

                  Lost and confused already.

                  How much of calendar.js needs to be copied to config,js?

                  Thanks

                  johnnyboyJ 1 Reply Last reply Reply Quote 0
                  • johnnyboyJ Offline
                    johnnyboy @Richard238
                    last edited by

                    @Richard238 said in Update says to “commit your changes or stash them before you can merge.” ?:

                    Lost and confused already.

                    How much of calendar.js needs to be copied to config,js?

                    Thanks

                    About this much…

                    {
                    			module: 'calendar',
                    			header: 'My Family Home Calendar',
                    			position: 'top_right',
                    			config: {
                                                     maximumEntries: 13,
                                                     maximumNumberOfDays: 365,
                                                     maxTitleLength: 25,
                                                     animationSpeed: 0,
                                                     fadePoint: 3,
                                                     timeFormat: 'absolute',
                                                     urgency: 7,
                                                     getRelative: 0,      
                    				calendars: [
                    					{
                    						symbol: 'calendar-check-o ',
                    						url: 'webcal://www.calendarlabs.com/templates/ical/UK-Holidays.ics'
                    					},
                                                            {
                                                                    symbol: `calendar-check-o `,
                                                                    url: "https://calendar.google.com/calendar/ical/mydetails.co.uk/private-mydetails/basic.ics"
                    				},
                                               ]
                    			}
                    		},
                        
                    		
                                    {
                                   
                    			module: 'compliments',
                    
                    R 1 Reply Last reply Reply Quote 0
                    • R Offline
                      Richard238 @johnnyboy
                      last edited by

                      Ok, these are done and no longer an issue, hurrah!:grinning:

                          css/main.css
                          modules/default/compliments/compliments.js
                          modules/default/newsfeed/newsfeed.js
                          modules/default/weatherforecast/weatherforecast.js
                      

                      Can’t get

                          modules/default/calendar/calendar.js
                      

                      into config.js though.

                      			module: 'calendar',
                      			header: 'Calendar',
                      			position: 'top_left',
                      			config: {
                                          maximumEntries: 8, // Total Maximum Entries
                                          maximumNumberOfDays: 365,
                                          displaySymbol: true,
                                          defaultSymbol: "calendar", // Fontawesome Symbol see http://fontawesome.io/cheatsheet/
                                          displayRepeatingCountTitle: false,
                                          defaultRepeatingCountTitle: "",
                                          maxTitleLength: 25,
                                          fetchInterval: 5 * 60 * 1000, // Update every 5 minutes.
                                          animationSpeed: 2000,
                                          fade: true,
                                          urgency: 0,
                                          timeFormat: "absolute",
                                          dateFormat: "ddd Do MMMM",
                                          getRelative: 2,
                                          fadePoint: 0.25, // Start on 1/4th of the list.
                                          hidePrivate: false,
                                          calendars: [
                      					{
                      						symbol: 'calendar-check-o ',
                      						url: 'https://calendar.google.com/calendar/ical/PRIVATE_KEY/basic.ics'
                      					}
                      				]
                      			}
                      		},
                      		{
                      			module: 'calendar',
                      			header: 'Binday',
                      			position: 'bottom_left',
                      			config: {
                                          maximumEntries: 8, // Total Maximum Entries
                                          maximumNumberOfDays: 365,
                                          displaySymbol: true,
                                          defaultSymbol: "calendar", // Fontawesome Symbol see http://fontawesome.io/cheatsheet/
                                          displayRepeatingCountTitle: false,
                                          defaultRepeatingCountTitle: "",
                                          maxTitleLength: 25,
                                          fetchInterval: 5 * 60 * 1000, // Update every 5 minutes.
                                          animationSpeed: 2000,
                                          fade: true,
                                          urgency: 0,
                                          timeFormat: "absolute",
                                          dateFormat: "ddd Do MMMM",
                                          getRelative: 2,
                                          fadePoint: 0.25, // Start on 1/4th of the list.
                                          hidePrivate: false,
                                          calendars: [
                                          {
                      						symbol: 'pagelines ',
                      						url: 'https://calendar.google.com/calendar/ical/PRIVATE_KEY/basic.ics'
                      					}
                      				]
                                      titleReplace: {
                                      //	"'s birthday": "",
                                      //	"Recycling": "Bins",
                                          "Red Bin": "Red and Black Bins",
                                          "Green Bin": "Green and Black Bins" 
                                      }
                      			}
                      		},  
                      

                      What have I missed?!

                      Thanks.

                      1 Reply Last reply Reply Quote 0
                      • yawnsY Offline
                        yawns Moderator
                        last edited by

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

                        1 Reply Last reply Reply Quote 0
                        • 1
                        • 2
                        • 3
                        • 1 / 3
                        • First post
                          Last post
                        Enjoying MagicMirror? Please consider a donation!
                        MagicMirror created by Michael Teeuw.
                        Forum managed by Sam, technical setup by Karsten.
                        This forum is using NodeBB as its core | Contributors
                        Contact | Privacy Policy