Navigation

    MagicMirror Forum

    • Register
    • Login
    • Search
    • Recent
    • Tags
    • Unsolved
    • Solved
    • MagicMirror² Repository
    • Documentation
    • Donate
    • Discord

    Update magic mirror error

    Troubleshooting
    2
    4
    28
    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
      StewartBaird86 last edited by

      Trying to run the update but get the following 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

      I have only edited my config.js and cloned modules to module folder.

      Tried the following commands and got same error

      Git pull

      Git pull && npm install

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

        @StewartBaird86 yeh, what a apin

        run my update script see
        https://github.com/sdetweil/MagicMirror_scripts

        read the readme for the 2 commands u will have to issue

        it will tell u you don’t need to save the package-lock.json files

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

          @sdetweil I am doing this remotely on a laptop. I am also a noob to all of this and don’t understand the bash portion.
          I have typed your script in using brackets, quotations etc and nothing happens in my terminal.
          what are the steps to execute the scripts

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

            @StewartBaird86 you just cut/paste the whole line… nothing to think about

            what do you mean ‘remotely’… via ssh??

            just paste the line into the ssh session window

            this is the test run command

            bash -c "$(curl -sL https://raw.githubusercontent.com/sdetweil/MagicMirror_scripts/master/upgrade-script.sh)"
            

            if all looks good, then u would execute this command

            bash -c "$(curl -sL https://raw.githubusercontent.com/sdetweil/MagicMirror_scripts/master/upgrade-script.sh)" apply
            
            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 Paul-Vincent Roll and Rodrigo Ramírez Norambuena.
            This forum is using NodeBB as its core | Contributors
            Contact | Privacy Policy