Cannot find module "moment"

[sdetweil]

@uok825 said in Cannot find module "moment":

you need to resolve your current index first

looks like some attempt to merge failed

run this in the MagicMirror folder

git diff --name-only --diff-filter=U

[uok825]

@sdetweil
pi@raspberrypi:~/MagicMirror $ git diff --name-only --diff-filter=U
package-lock.json

[sdetweil]

@uok825 that’s weird. that file is rebuilt every install

rm package-lock.json
then
git status
and git branch

also, connect via ssh, then everything will be in text so you can just copy/paste

[uok825]

@sdetweil rm: ‘package-lock.json’ cant deleted: No such a file or folder.

[sdetweil]

@uok825 ok, still weird

do git checkout master

[uok825]

@sdetweil said in Cannot find module "moment":

git checkout master

[sdetweil]

@uok825 ok try these two commands
<file> is package-lock.json

this restores the file status in the index

git reset – <file>

then check out a copy from the index

git checkout – <file>

notice that is two dashes

[uok825]

@sdetweil I’ll do ’ git reset - package-lock-json ’ right?

[sdetweil]

@uok825 and then git checkout …

and then git status

[uok825]

@sdetweil Sorry. I dont understand Sam. Can you help a little. What exactly will I write?