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 started but not finished

    Scheduled Pinned Locked Moved Bug Hunt
    3 Posts 2 Posters 444 Views 2 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.
    • C Offline
      com1cedric
      last edited by

      Hello,
      after using the official command to update the mirror to the latest version…
      pi@raspberrypi:~/MagicMirror $ git pull && npm install --only=prod --omit=dev

      … this error occurs before finishing the update:

      Update 30d5bfe5…9e029304
      error: Your local changes to the following files would be overwritten by the merge :
      package-lock.json
      package.json
      Please commit or re-save your changes before the merge.
      Abort
      pi@raspberrypi:~/MagicMirror $

      would you have an advice how to finish the install?
      Thank you in advance
      Cédric

      S 1 Reply Last reply Reply Quote 0
      • S Offline
        sdetweil @com1cedric
        last edited by

        @com1cedric you can erase package-lock.json, it will be rebuilt

        what is the change to package.json?

        do

        git diff package.json
        

        we need the new one in the update

        move it out of the way

        mv package.json old_package.json
        

        then restart the update… using my script might be better

        see https://github.com/sdetweil/MagicMirror_scripts

        Sam

        How to add modules

        learning how to use browser developers window for css changes

        C 1 Reply Last reply Reply Quote 0
        • C Offline
          com1cedric @sdetweil
          last edited by

          @sdetweil great, thank you very much ! really appreciate your help!

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