• Recent
  • Tags
  • Unsolved
  • Solved
  • MagicMirror² Repository
  • Documentation
  • 3rd-Party-Modules
  • Donate
  • Discord
  • Register
  • Login
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.

How do I "commit" changes to allow an update

Scheduled Pinned Locked Moved Unsolved Troubleshooting
updatescommiterrorerror updatingtrouble updatinghelp
4 Posts 4 Posters 4.9k Views 4 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.
  • P Offline
    PierrePi
    last edited by Jun 1, 2018, 9:08 PM

    So I booted up my Raspi 2 with MagicMirror for the first time in a while, and after the system had booted up with MagicMirror, at the top of the Mirror UI, I was greeted with the message “MagicMirror2 update available” and on the line below “The Current Installation is 567 commits behind on the master branch”. So, wanting my magicmirror to be up to date, I looked up how to update my pi and found that I should enter

    cd ~/MagicMirror && git pull
    

    So, I did this I got the following error

    error: Your local changes to the following files would be overwritten by merge:
    modules/default/calendar/calendar.js
    modules/default/clock/clock.js
    modules/default/currentweather/currentweather.js
    Please, commit your changes or stash them before you can merge
    aborting
    

    How do I commit/stash these changes I have made to the modules, or is there another way I can update the software?

    Also I am very inexperienced with coding, so go easy on me.

    Thank you!

    N I 2 Replies Last reply Jun 1, 2018, 9:20 PM Reply Quote 0
    • N Offline
      ninjabreadman @PierrePi
      last edited by Jun 1, 2018, 9:20 PM

      @pierrepi I posted recently on how to “stash” your changes in git. You don’t want to commit them, except to share with others.

      Problem with config or JavaScript? Copy/paste it into JSHint.
      Check out the detailed walkthroughs on install, config, modules, etc.

      1 Reply Last reply Reply Quote 1
      • I Offline
        idoodler Module Developer @PierrePi
        last edited by Jun 1, 2018, 10:03 PM

        @pierrepi Thats exactly why you don’t make any lokal changes to the project files without forking.

        I realy recogmend you to create a fork of every submodule you edit. This makes updating much easier.

        1 Reply Last reply Reply Quote 0
        • S Offline
          sispheor
          last edited by Jun 2, 2018, 10:07 PM

          Create a branch on top of the master one.
          When an update is available, go back to the master, do the pull.
          Then rebase your branch onto master.

          1 Reply Last reply Reply Quote 1
          • 1 / 1
          1 / 1
          • First post
            2/4
            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