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

PierrePi

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!

ninjabreadman

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

idoodler

@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.

sispheor

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.