Newbie question on updates

ChrisEW

@Mykle1 Yes, I ran git pull while in the MMM-Scrobbler directory and got “error: your local changes to the following files would be overwritten by merge: MMM-Scrobbler.js

Please commit your changes or stash them before you can merge.
Aborting”

Mykle1

@ChrisEW said in Newbie question on updates:

“error: your local changes to the following files would be overwritten by merge: MMM-Scrobbler.js

Well, you made changes to the MMM-Scrobbler.js, which is not recommended. That is what the error is telling you. So, you won’t be able to update normally.

ChrisEW

@Mykle1 I did? I don’t remember doing that. I guess I’ll have to either start over, or examine the file. Thank you.

izanbard

I added a script to this topic that should see you covered:

https://forum.magicmirror.builders/topic/361/how-to-update/12?page=2

ChrisEW

@Mykle1 I looked over the file, and honestly I am not good enough to be modifying files, believe me. I did notice in the MMM-Scobbler file that my username and API key appear there. I really cant remember entering this info there, but I do recall entering this in the main config.js file. Do these two parameters automatically get transferred over to the Scrobbler file?

Mykle1

@ChrisEW

No, they don’t automatically get transferred from one to the other so perhaps you entered them into the js file and don’t remember. In any case, this is enough for the update not to work.

Try this. Rename the Scrobbler.js file to something else, then in your terminal run git pull in the MMM-Scrobbler directory. That should update it unless something else was changed

ChrisEW

@Mykle1 Thanks very much. I did this and git pull downloaded a brand new Scrobbler.js file. I’ve left the username and API Key areas as is. Works fine, so far no messages!

Mykle1

@ChrisEW said in Newbie question on updates:

Thanks very much

You’re welcome. So, in the future, ask a question in a topic before you go changing anything in the module files. :-)