MagicMirror Forum

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

    SOLVED little update Problem ..

    Troubleshooting
    2
    4
    457
    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.
    • Stoffbeuteluwe
      Stoffbeuteluwe Project Sponsor last edited by

      Patricks-Mini:MagicMirror patrickhahn$ git pull && npm install
      Updating a31546b…500147e
      error: Your local changes to the following files would be overwritten by merge:
      package-lock.json
      package.json
      Please commit your changes or stash them before you merge.
      Aborting
      Patricks-Mini:MagicMirror patrickhahn$

      can anybody help me? Thanks

      S 2 Replies Last reply Reply Quote 0
      • S
        sdetweil @Stoffbeuteluwe last edited by

        @Stoffbeuteluwe use my new update script

        see
        https://forum.magicmirror.builders/topic/10859/new-update-upgrade-script-ready-for-testing

        Sam

        Create a working config
        How to add modules

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

          @Stoffbeuteluwe also, do

          git diff package.json

          what are the differences?

          Sam

          Create a working config
          How to add modules

          1 Reply Last reply Reply Quote 0
          • Stoffbeuteluwe
            Stoffbeuteluwe Project Sponsor @sdetweil last edited by

            @sdetweil Hi, the script works fine …thank you

            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