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.

    Can't Update

    Scheduled Pinned Locked Moved Troubleshooting
    4 Posts 3 Posters 2.9k 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.
    • D Offline
      dwleo
      last edited by

      Hi,
      Very new to this but getting there.
      My mirror works well but I cannot seem to update to the new version.
      I get the following error message:

      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 can merge.

      The thing is, I haven’t touched the file in question.
      Any ideas?

      • Dwleo
      1 Reply Last reply Reply Quote 0
      • M Offline
        meisch23
        last edited by

        I just moved the file into my /home/pi directory then did git pull in mm directory and once I realized it worked fine I just deleted the .json

        1 Reply Last reply Reply Quote 0
        • MichMichM Offline
          MichMich Admin
          last edited by

          Run the following command from within the MagicMirror folder, and try again:

          git reset --hard; git clean -df;
          
          D 1 Reply Last reply Reply Quote 0
          • D Offline
            dwleo @MichMich
            last edited by

            @michmich Thasnks MitchMitch.
            That did it.

            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