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.

    git pull error

    Scheduled Pinned Locked Moved Solved Troubleshooting
    5 Posts 3 Posters 1.2k Views 3 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.
    • M Offline
      motdog
      last edited by

      pi@raspberrypi:~/MagicMirror/modules/MMM-MyScoreboard $ git pull
      Updating 0dbb518…3a07af6
      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.

      I have tried a few things I found on google with no luck. Any help would be appreciated.

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

        git checkout – package-lock.json followed by git pull worked

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

          @motdog yes, package-lock is rebuilt by npm install, so it is changed

          its not important in the operation… it IS important in the automated testing done on the package for changes… (keeps the lib content consistent)

          Sam

          How to add modules

          learning how to use browser developers window for css changes

          richland007R 1 Reply Last reply Reply Quote 0
          • richland007R Offline
            richland007 @sdetweil
            last edited by

            @sdetweil Hey guys i am trying ot update MMM-GooglePhotos and when i do git pull i get the following

            Updating 0d001d8..76368f5
            error: Your local changes to the following files would be overwritten by merge:
               package.json
            Please commit your changes or stash them before you merge.
            error: The following untracked working tree files would be overwritten by merge:
               package-lock.json
            Please move or remove them before you merge.
            Aborting
            
            

            when i run

            git checkout – package-lock.json
            

            I get the following

            error: pathspec '–' did not match any file(s) known to git
            error: pathspec 'package-lock.json' did not match any file(s) known to git
            

            What am i doing wrong and how do i overcome these 2 errors on the git pull??

            Thank you
            Denis

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

              @richland007 said in git pull error:

              The following untracked working tree files would be overwritten by merge:
              package-lock.json

              untracked means its not in the repo just erase it
              -lock files are rebuilt on npm install

              Sam

              How to add modules

              learning how to use browser developers window for css changes

              1 Reply Last reply Reply Quote 1
              • 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