git pull error

motdog

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.

motdog

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

sdetweil

@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)

richland007

@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

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