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 42.3k 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

      And suddenly it come back into life! :)

      1 Reply Last reply Reply Quote 0
      • P Offline
        pepemujica @yawns
        last edited by

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

        1 Reply Last reply Reply Quote 0
        • B Offline
          bminer1 @yawns
          last edited by yawns

          @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
          
          yawnsY 1 Reply Last reply Reply Quote 0
          • yawnsY Offline
            yawns Moderator @bminer1
            last edited by

            @bminer1
            please run

            git reset --hard
            git pull
            npm install
            

            You left out the --hard option :)

            1 Reply Last reply Reply Quote 0
            • rudibaraniR Offline
              rudibarani Project Sponsor
              last edited by

              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?
              1 Reply Last reply Reply Quote 0
              • 1
              • 2
              • 3
              • 3 / 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