MagicMirror Forum
    • Recent
    • Tags
    • Unsolved
    • Solved
    • MagicMirror² Repository
    • Documentation
    • 3rd-Party-Modules
    • Donate
    • Discord
    • Register
    • Login
    1. Home
    2. PierrePi
    A New Chapter for MagicMirror: The Community Takes the Lead
    Read the statement by Michael Teeuw here.
    P
    Offline
    • Profile
    • Following 0
    • Followers 0
    • Topics 1
    • Posts 1
    • Groups 0

    PierrePi

    @PierrePi

    0
    Reputation
    397
    Profile views
    1
    Posts
    0
    Followers
    0
    Following
    Joined
    Last Online

    PierrePi Unfollow Follow

    Latest posts made by PierrePi

    • How do I "commit" changes to allow an update

      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!

      posted in Troubleshooting updates commit error error updating trouble updating help
      P
      PierrePi