How to update.

[batzyn]

thank u!

[akrishnan.j]

@batzyn

pi@akpi:~/MagicMirror $ sudo git pull && npm install
Updating 8010e62…5c41e24
error: Your local changes to the following files would be overwritten by merge:
css/main.css
Please, commit your changes or stash them before you can merge.
Aborting
Any ideas…

[johnnyboy]

This post is deleted!

[Unbored]

This post is deleted!

[Unbored]

@izanbard Thank you.

 #!/usr/bin/env bash

cd /home/pi/MagicMirror
echo "######### CHECKING MAGIC MIRROR ##########"

Has anyone else deployed this script?

When I try to run it as a .py or .sh there is an error on line 6 stating invalid syntax at the end of the first echo row. Any suggestions on clearing this issue?

[Binog]

@Unbored
Delete the " and add straight ones again " (If You edited this file via an alternate editor on win/Mac then it might be a cursive "… try it, worked for me!

[KX900]

hi

i get this message:

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

what should i do?

[broberg]

@KX900 backup those files somewhere if you want to keep the changes you’ve made (you shouldn’t have made any changes in those files unless you really reaally had to) and then delete them and try to update again.

[KX900]

@broberg
thank you.
i had to do the changes because of “Umlaute”.

[SpecialRob]

@akrishnan.j

I was just searching for the same thing and had the same error message.
I renamed the offending file
ran the sudo git pull && nom install command
update worked fine without error and installed a new copy of offending file
copy the original file back if your edits were critical