MagicMirror Forum

    • Register
    • Login
    • Search
    • Recent
    • Tags
    • Unsolved
    • Solved
    • MagicMirror² Repository
    • Documentation
    • Donate
    • Discord
    MagicMirror² v2.20.0 is available! For more information about this release, check out this topic.

    Error on Updating to v2.6.0

    Troubleshooting
    3
    4
    968
    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.
    • swvalenti
      swvalenti Project Sponsor last edited by

      Keep getting this error…running node 9.11.2

      pi@raspberrypi:~/MagicMirror $ git pull && npm install
      Updating 6db61b4…de57daa
      error: Your local changes to the following files would be overwritten by merge:
      package-lock.json
      vendor/package-lock.json
      Please commit your changes or stash them before you merge.
      Aborting

      1 Reply Last reply Reply Quote 1
      • S
        sdetweil last edited by

        Erase both lock files, and go again

        Sam

        Create a working config
        How to add modules

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

          @sdetweil that worked thank you sir!

          1 Reply Last reply Reply Quote 0
          • D
            dawees last edited by

            thanks a lot 🙂 working for me

            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