Updated, but 'MMM-EventHorizon' still shows as being behind.

Richard238

‘MMM-EventHorizon’ says my MM is 27 commits behind.

I’ve updated, twice, but still the same 27 commits message remains.
Any idea why, please?

Thanks.

yawns

@richard238 said in Updated, but 'MMM-EventHorizon' still shows as being behind.:

Please, commit your changes or stash them before you can merge

If you are sure you did not make any changes, then run this in the MMM-EventHorizon folder:

git reset --hard
git pull
npm install

lavolp3

@richard238 Did you mean the other way around?
Like “MM says your MMM-EventHorizon is 27 commits behind”

Then go into modules/MMM-EventHorizon
and do a

git pull
npm install

You need to update the module (or better, the git repository) that is mentioned in the header. For that you need to go into the module folder and do above.
Every 3rd party module is it’s own repository and needs to be maintained on its own.

Richard238

pi@raspberrypi:~/MagicMirror/modules/MMM-EventHorizon $ git pull && npm installUpdating 73d1110..6d5a53a
error: Your local changes to the following files would be overwritten by merge:
	MMM-EventHorizon.js
Please, commit your changes or stash them before you can merge.
Aborting

What does that mean?
I think I’ve made any changes to the Event Horizon module.

yawns

@richard238 said in Updated, but 'MMM-EventHorizon' still shows as being behind.:

Please, commit your changes or stash them before you can merge

If you are sure you did not make any changes, then run this in the MMM-EventHorizon folder:

git reset --hard
git pull
npm install

Richard238

@yawns That’s fixed it, thank you!

Mykle1

Thanks @yawns and @lavolp3 for looking out while I was at work. Somebody has to pay for all my toys. :-)