MagicMirror Forum

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

    SOLVED Getting an error on update

    Troubleshooting
    3
    4
    583
    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
      CliffordW last edited by

      I enter

      git pull && npm install

      I am seeing this error:

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

      I am a noob with git. What should I do to complete the update?

      mumblebaj 1 Reply Last reply Reply Quote 0
      • mumblebaj
        mumblebaj Project Sponsor @CliffordW last edited by

        @CliffordW From within the MagicMirror folder do the following:

        git reset --hard
        

        Then do

        git pull && npm install
        

        That should solve your problem

        C 1 Reply Last reply Reply Quote 0
        • C
          CliffordW @mumblebaj last edited by

          @mumblebaj Thanks!

          1 Reply Last reply Reply Quote 0
          • swvalenti
            swvalenti Project Sponsor last edited by

            I just removed those files out of MagicMirror by adding them to the desktop and ran the commands with no issue as well.

            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