Update Magic Mirror error

MisterT

Hi,
I have a problem with my Magic Mirror. I just want to update my MM but i can’t because the result of “git pull && npm install” is: (in french)

Mise à jour de57daa…a31546b
error: Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :
config/config.js.sample
package-lock.json
vendor/package-lock.json
Veuillez valider ou remiser vos modifications avant la fusion.
Abandon

and with google translate:
Updated from57daa…a31546b
error: Your local changes to the following files would be overwritten by the merge:
config / config.js.sample
Package-lock.json
vendor / package-lock.json
Please validate or postpone your changes before the merge.
abandonment

Can anobody tell me the command line to close this error in order to restart git pull?

Thanks for next answers

sdetweil

@MisterT said in Update Magic Mirror error:

Package-lock.json
vendor / package-lock.json

you can erase these two files, then will be created

config/config.js.sample

git thinks this file was changed, and it should not have been

so, restore that file from the local repo

cd ~/MagicMirror
git checkout -- config/config.js.sample

then try again,

I have been working on a new script to do upgrades, to help avoid these problems…
i’d be interested in your experience if u could try it…

see
https://forum.magicmirror.builders/topic/10859/new-update-upgrade-script-ready-for-testing

mumblebaj

@MisterT You could also just do a git reset --hard and then git pull $$ npm install. I have had this issue every time I had to update my mirror.

MisterT

hi,
sdetweil: i try your solution:

cd ~/MagicMirror
git checkout – config/config.js.sample

but i have the same problem. git pull said me the same thing. Have you a other idea?

mumblebaj: if y use this command line, all my modules and config will be deleted? if i copy my modules folder and config folder and paste them in the new version of Magic mirror, everything will work fine?

Thanks

mumblebaj

@MisterT You will not lose your modules and configs.

sdetweil

@MisterT notice my post had 2 - in front of filename. Yours appears only to have one

MisterT

thanks @mumblebaj you’re awesome !!!. Git reset --hard work fine
Update MM2.8 is ok.

mumblebaj

@MisterT Great it worked for you. Please mark the post as Resolved if you are happy that it worked.