MagicMirror Forum
    • Recent
    • Tags
    • Unsolved
    • Solved
    • MagicMirror² Repository
    • Documentation
    • 3rd-Party-Modules
    • Donate
    • Discord
    • Register
    • Login
    A New Chapter for MagicMirror: The Community Takes the Lead
    Read the statement by Michael Teeuw here.

    Looking for Beta-testers!

    Scheduled Pinned Locked Moved MagicMirror
    56 Posts 17 Posters 58.4k Views 18 Watching
    Loading More Posts
    • Oldest to Newest
    • Newest to Oldest
    • Most Votes
    Reply
    • Reply as topic
    Log in to reply
    This topic has been deleted. Only users with topic management privileges can see it.
    • K Offline
      kckndrgn
      last edited by

      Cool, I’m in, I like breaking things LOL :D

      As a noob to the MM project I’m really fascinated by it and eager to start writing my own modules (though I keep finding modules that suit my purpose).

      1 Reply Last reply Reply Quote 0
      • pigrecoP Offline
        pigreco
        last edited by

        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

        KirAsh4K 1 Reply Last reply Reply Quote 0
        • MichMichM Offline
          MichMich Admin
          last edited by

          @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

          1 Reply Last reply Reply Quote 0
          • pigrecoP Offline
            pigreco
            last edited by

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

            Thanks
            PI

            MichMichM 1 Reply Last reply Reply Quote 0
            • MichMichM Offline
              MichMich Admin @pigreco
              last edited by

              @pigreco You could also try:

              git fetch origin
              git reset --hard origin/develop
              git clean -f
              
              1 Reply Last reply Reply Quote 0
              • pigrecoP Offline
                pigreco
                last edited by

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

                1 Reply Last reply Reply Quote 0
                • D Offline
                  dejayou
                  last edited by

                  This post is deleted!
                  1 Reply Last reply Reply Quote 0
                  • KirAsh4K Offline
                    KirAsh4 Moderator @pigreco
                    last edited by

                    @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.

                    A Life? Cool! Where can I download one of those from?

                    1 Reply Last reply Reply Quote 0
                    • bscaranoB Offline
                      bscarano
                      last edited by

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

                      KirAsh4K MichMichM 2 Replies Last reply Reply Quote 0
                      • KirAsh4K Offline
                        KirAsh4 Moderator @bscarano
                        last edited by

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

                        A Life? Cool! Where can I download one of those from?

                        1 Reply Last reply Reply Quote 0
                        • 1
                        • 2
                        • 3
                        • 4
                        • 5
                        • 6
                        • 2 / 6
                        • First post
                          Last post
                        Enjoying MagicMirror? Please consider a donation!
                        MagicMirror created by Michael Teeuw.
                        Forum managed by Sam, technical setup by Karsten.
                        This forum is using NodeBB as its core | Contributors
                        Contact | Privacy Policy