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.7k 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
      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 Offline
            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
              • S Offline
                sdetweil @CyruS1337
                last edited by sdetweil

                @cyrus1337

                rm package-lock.json
                rm vendor/package-lock.json 
                

                then

                git pull
                

                as before
                then probably reinstall npm modules

                from MagicMirror folder

                npm install
                

                Sam

                How to add modules

                learning how to use browser developers window for css changes

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

                  @sdetweil said in 2318 commits behind...:

                  rm package-lock.json
                  rm vendor/package-lock.json

                  Thank you for your quick help. Everything works :)

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