issues updating MMM-calendar EXT3

[sdetweil]

@nschertz you ARE in the module folder, right?
edited

cd ~/MagicMirror/modules/MMM-CalendarExt3
git checkout package-lock.json
git pull
npm install

right?

[BKeyport]

just for information, the real issue is the the lock file is included in the package, right?

[sdetweil]

@BKeyport and it gets updated by npm install

You can do npm ci
Which will ONLY install the EXACT versions listed in the lock file, even if it’s wrong for your system

[nschertz]

@sdetweil Correct. After executing “git reset package-lock.json”, I get the message “Unstaged changes after reset:
M package-lock.json”

I then run git pull and get
pi@MagicMirror:~/MagicMirror/modules/MMM-CalendarExt3 $ git pull

Updating e93534d…5f276d4
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.
Aborting

[sdetweil]

@nschertz sorry, oops… wrong command!

git checkout package-lock.json

fixed the prior posts with note edited

[nschertz]

to clarify… execute “git checkout package.json” instead of " git reset package.json" or execute “git checkout package.json” and " git reset package.json"?

[sdetweil]

@nschertz git checkout

restores it from the local source repo

git reset
removes it from the staged to be submitted as a change

I posted the checkout first, then a user posted reset and I blindly followed it…
my mistake

[nschertz]

oops meant to type

to clarify… execute “git checkout package-lock.json” instead of " git reset package-lock.json" or execute “git checkout package-lock.json” and " git reset package-lock.json"?

[nschertz]

Got it ! git checkout… worked! Thanks for the clarification on what git reset does verses git checkout.

[sdetweil]

@nschertz awesome… sorry for the misdirection