issues updating MMM-calendar EXT3

[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

[sdetweil]

in the git model

the files you see are called the working directory
and the repo is hidden in the .git folder

that is where the actual ‘state’/contents of each file exists

so checkout copies the contents from the repo to the working directory

if you were developing and had a change
git status would show changed files in the working directory

git diff will show WHAT changed on each file

to lock it down in the local copy of the repo
you git add it to a potential ‘commit’,
then git status shows it as ‘staged’

to REMOVE it from staged, use the git reset command

git commit puts it into the local repo as a change

then you ‘push’ your entire local repo to the parent (git remote -v)

and the changes (if accepted) are merged and that change is in the master for
all new ‘pulls’

[nschertz]

@sdetweil thank you ! This explanation is very helpful. I’m still a little new to the git environment.