Problem to update

greda

Hello Everybody,

I ve got a message on my miroir :
the current installation is 149 commits late on the master branch

I try to make update with this command : sudo git pull && npm install in the folder MagiMirror/module but i ve got this message : error: Your local changes to the following files would be overwritten by merge : modules/default/compliments/compliments.js
Please, commit your changes or stash them before you can merge.
Aborting
Thank you for your helping.

AxLed

Hi greda,

if you dont need the changes anymore:
change in the directory (modules/default/compliments in your case)

git reset --hard

git pull origin master

After this, try to update again, you should get further with your update.

Regards AxLED

greda

Hi AxLED

Thank you so much nom i ve got update on my MagicMirror.

Regards Greda