Looking for Beta-testers!

pigreco

Hello guys,

i have tried to pass to development branch but i got this error

error: Your local changes to the following files would be overwritten by checkout:
modules/default/clock/clock.js
Please, commit your changes or stash them before you can switch branches.
Aborting

I suppose that was due to my code change on the second colour of the analog clock in the module clock.js…i had just put the red colour #FF0000…i have retested with the @ #888888 one but still the same error…

A possible bug?

Cheers
Pi

MichMich

@pigreco, no this is the expected result. GIT doesn’t want to overwrite your changes. This is why you should never make ani modifications to the modules or the core files. If you want to modify the design, you can use the css/custom.css file (this file will be ignored by git).

To remove your changes so that you can update continue, please use: git stash

pigreco

Hello @MichMich thanks for the suggestion…not very familiar with stash, i need to authenticate ?

Thanks
PI

MichMich

@pigreco You could also try:

git fetch origin
git reset --hard origin/develop
git clean -f

pigreco

Thanks @MichMich …the issue is solved…i am on the develop branch :-)

dejayou

This post is deleted!

KirAsh4

@pigreco, I didn’t expose the other clock hands to be easily accessible to change the colors on. I’ll have to add that in in a later update. As @MichMich said, making changes to those core files will cause git to start complaining at you.

bscarano

I’m now on Develop. Will this update automatically or will I need to run something periodically?

KirAsh4

@bscarano, regardless of which branch you are on, you are in charge of your mirror, including updating the code.

MichMich

@bscarano To update to the latest version, you’ll need to pull the latest changes. This can be done using: git pull (from the command line within your MagicMirror² folder).