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.

    2318 commits behind...

    Scheduled Pinned Locked Moved Solved Troubleshooting
    17 Posts 8 Posters 6.8k Views 7 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.
    • S Offline
      savona @bhepler
      last edited by

      @bhepler maybe.

      but I saw that the originator of the docker image said it was updated daily with a cronjob on this post:

      https://forum.magicmirror.builders/topic/5316/automatic-docker-build/2

      1 Reply Last reply Reply Quote 0
      • idoodlerI Offline
        idoodler Module Developer @savona
        last edited by

        @savona Both package-lock.json can just be deleted. Did you intentionally change the files in the default directory?

        S 1 Reply Last reply Reply Quote 0
        • S Offline
          savona @idoodler
          last edited by

          @idoodler No I did not change the default directory at all. That is why this is so odd to me.

          idoodlerI 1 Reply Last reply Reply Quote 0
          • R Offline
            rummyr
            last edited by

            I got a message saying my MM was out of date, so I pulled the new docker image and now have the 2318 message also.

            The top of my CHANGELOG.md reads “## [2.5.0] - 2018-10-01”
            Though the “image date” as reported by Portainer is “Created 2019-01-01 15:08:22”

            Do we need to wait for bastilimbach?

            1 Reply Last reply Reply Quote 0
            • idoodlerI Offline
              idoodler Module Developer @savona
              last edited by

              @savona OK, you may have a corrupt git directory then. You may try to clone it again.

              1 Reply Last reply Reply Quote 0
              • S Offline
                savona
                last edited by

                I just blew away the docker image and did a new pull and it is fixed and on 2.6.0.

                grep version package.json

                “version”: “2.6.0”,

                1 Reply Last reply Reply Quote 2
                • T Offline
                  Thelonius
                  last edited by

                  I was able to proceed past this error by using the command ‘git stash’. This worked for two Magic Mirrors.

                  1 Reply Last reply Reply Quote 0
                  • CyruS1337C Offline
                    CyruS1337 Project Sponsor
                    last edited by

                    Hello everybody

                    I have three MagicMirrors in use. On two mirrors he shows me that I’m 2318 and 124 behind the master respectively.

                    If I enter git pull in the MagicMirror folder, error occurs

                    Aktualisiere 6db61b4..de57daa
                    error: Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge
                    überschrieben werden:
                            package-lock.json
                            vendor/package-lock.json
                    Bitte committen oder stashen Sie Ihre Änderungen, bevor sie mergen.
                    Abbruch
                    
                    

                    What do I have to do to bring the MagicMirror up to date?

                    1 Reply Last reply Reply Quote 0
                    • S Do not disturb
                      sdetweil
                      last edited by

                      you can erase those two files, then git pull again

                      Sam

                      How to add modules

                      learning how to use browser developers window for css changes

                      1 Reply Last reply Reply Quote 0
                      • CyruS1337C Offline
                        CyruS1337 Project Sponsor
                        last edited by

                        @sdetweil said in 2318 commits behind...:

                        you can erase those two files, then git pull again

                        Ok, can you tell me how to delete and reload? Sorry, but unfortunately I do not understand so much of the matter :(

                        S 1 Reply Last reply Reply Quote 0
                        • 1
                        • 2
                        • 1 / 2
                        • 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