Try to update: Git pull && NPM install aborting because of package-lock.json

paviro / MMM-PIR-Sensor

This module can monitor a PIR motion sensor and put your mirror to sleep.

215 stars 94 forks source link

Closed MadhunterNL closed 4 years ago

MadhunterNL commented 4 years ago

When I try to git pull I get this error:

The following untracked working tree files would be overwritten by merge: package-lock.json Please move or remove them before you merge. Aborting

How can I avoid this error? I get this not only with this module but also with other module updates.

M1dn8 commented 4 years ago

cd MagicMirror/modules/MMM-PIR-Sensor rm package-lock.json git pull

this was my solution!

paviro commented 4 years ago

I am not sure https://github.com/paviro/MMM-PIR-Sensor/blob/master/package-lock.json should be in the repo any insight @eric-h-st? Besides that I am unsure if remove the file is avoidable since it is generated on 'npm install' I think.

eric-h-st commented 4 years ago

Please do a git pull and npm install. The said file has been removed.