Git Workflow Tips

Resolve package-lock.json Conflicts on Pull

When the remote version of package-lock.json conflicts with your local one during a git pull, restore the remote version first, then pull:

git checkout -- package-lock.json
git pull

This discards your local package-lock.json changes and replaces them with the remote version. After pulling, run npm install to regenerate package-lock.json with your current node_modules.