How to update.

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

gripworks

I have never had an issue updating until tonight. I got the following message back and am not sure how to proceed.


pi@magicmirror:~/MagicMirror $ git pull

*** Please tell me who you are.

Run

  git config --global user.email "you@example.com"
  git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: empty ident name (for ) not allowed

I’m sure it’s something stupid I don’t understand ,(not super knowledgeable about linux). I have tried entering various credentials in various ways but my lack of understanding the correct syntax seems to be my undoing.

Thanks in advance.

Snille

@gripworks this usually happens when you have cloned the repository with ssh instead of https.
At least that’s what I have figured out works. :)

If you just do the suggested commands it’s all solved.
It’s github that wants to know who you are. :)

git config --global user.email "you@example.com"
git config --global user.name "Your Name"

gripworks

Thank you, That worked. I appreciate the help.

dam4

@Snille
I am new to Linex and I have copied your script exactly and I get the following error.
-bash: update.sh: command not found

I called the script update.sh and I was going to use it in a cron job after I tested it to make sure it worked. Can you tell me what I might have done wrong. Thank you in advance for your help.

izanbard

@dam4 It is likely that two things are wrong.

First the script needs to be executable so please run:

$ chmod u+x update.sh

this will add execute permissions for the file owner to the file. Have a look at man chmod for more detail.

The next thing is to make sure that Linux knows where to look for it. This can be quite a complicated subject involving descriptions of the $PATH environment variable and all sorts. But the easy way to do it is to add a relative or absolute path to the start of the command. So from the command prompt in the folder where the script exists try:

$ ./update.sh

where the . means “this folder”. For the cron tab through you might want to use the full path something like:

0 2 * * * /full/path/to/file/update.sh

Hope at least some of that is meaningful for you.

dam4

@izanbard
Thank you. I did the chmod to make it executable but using the ./update.sh worked. Thank you again for your help.