Read the statement by Michael Teeuw here.
Looking for Beta-testers!
-
@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
-
Hello @MichMich thanks for the suggestion…not very familiar with stash, i need to authenticate ?
Thanks
PI -
@pigreco You could also try:
git fetch origin git reset --hard origin/develop git clean -f
-
Thanks @MichMich …the issue is solved…i am on the develop branch :-)
-
This post is deleted! -
-
I’m now on Develop. Will this update automatically or will I need to run something periodically?
-
@bscarano, regardless of which branch you are on, you are in charge of your mirror, including updating the code.
-
@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). -
I am now on the development branch.
I have verified that the changes fixed my “blank screen” with the language set in the config file.Thanks!