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.

    Update Help

    Scheduled Pinned Locked Moved Unsolved Troubleshooting
    12 Posts 5 Posters 6.2k Views 5 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.
    • J Offline
      jhwwhite
      last edited by

      Hello,

      I’m having some trouble with the update when I tried to install I get this error

      Updating de57daa..b508a62
      error: Your local changes to the following files would be overwritten by merge:
      	package-lock.json
      Please commit your changes or stash them before you merge.
      Aborting
      

      when I try to remove the offending file I get this

      rm: cannot remove 'pacage-lock.json': No such file or directory
      pi@raspberrypi:~/MagicMirror $ rm package-lock.json
      rm: cannot remove 'package-lock.json': No such file or directory
      

      Does anyone have any clue how I proceed?

      thedoorsfanaticT DæmonEyesD 2 Replies Last reply Reply Quote 1
      • thedoorsfanaticT Offline
        thedoorsfanatic @jhwwhite
        last edited by

        @jhwwhite
        I had a similar problem.
        Have you tried this?
        Inside the MagicMirror directory:
        git stash
        Then
        git pull
        Then
        npm install
        Afte that search in which module the package file is located and
        npm install

        My Smart Mirror YouTube playlist: https://www.youtube.com/playlist?list=PL9Iv_4Mvy6o2tnvdhNBstVWNefgUP9ELp

        DæmonEyesD 1 Reply Last reply Reply Quote 1
        • J Offline
          jhwwhite
          last edited by

          That did it! Thanks so much!

          thedoorsfanaticT 1 Reply Last reply Reply Quote 0
          • DæmonEyesD Offline
            DæmonEyes @thedoorsfanatic
            last edited by

            @thedoorsfanatic I tried this but this happened when I tried git stash

            0_1554431691402_20190404_213003.jpg

            thedoorsfanaticT 1 Reply Last reply Reply Quote 0
            • DæmonEyesD Offline
              DæmonEyes @jhwwhite
              last edited by

              @jhwwhite I’m a similar situation, but with a few more lines to my error message

              0_1554431826095_20190404_212934.jpg

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

                Try it like this:

                Run the following command in the MagicMirror folder

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

                Then execute in the folder the usual command for the upload

                git pull && npm install
                

                Now it should work

                J 1 Reply Last reply Reply Quote 0
                • thedoorsfanaticT Offline
                  thedoorsfanatic @DæmonEyes
                  last edited by

                  @DæmonEyes
                  Just fill in your github user email and username

                  My Smart Mirror YouTube playlist: https://www.youtube.com/playlist?list=PL9Iv_4Mvy6o2tnvdhNBstVWNefgUP9ELp

                  DæmonEyesD 1 Reply Last reply Reply Quote 1
                  • thedoorsfanaticT Offline
                    thedoorsfanatic @DæmonEyes
                    last edited by thedoorsfanatic

                    @DæmonEyes
                    This is what worked for me but I am a beginner, too
                    Inside the MagicMirror directory:
                    git stash
                    Then
                    git pull
                    Then
                    npm install
                    After that search for modules that use package.json files, go to their directories and
                    npm install

                    My Smart Mirror YouTube playlist: https://www.youtube.com/playlist?list=PL9Iv_4Mvy6o2tnvdhNBstVWNefgUP9ELp

                    1 Reply Last reply Reply Quote 1
                    • thedoorsfanaticT Offline
                      thedoorsfanatic @jhwwhite
                      last edited by

                      @jhwwhite
                      Great, I am glad that worked for you, too!

                      My Smart Mirror YouTube playlist: https://www.youtube.com/playlist?list=PL9Iv_4Mvy6o2tnvdhNBstVWNefgUP9ELp

                      1 Reply Last reply Reply Quote 0
                      • DæmonEyesD Offline
                        DæmonEyes @thedoorsfanatic
                        last edited by DæmonEyes

                        @thedoorsfanatic Thanks, I wasn’t sure what email/username they wanted and I didn’t even have a github profile, so I created one. And then everything worked after that!

                        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