Doing a git merge on package-lock.json is always so frustrating 😭.
@mauve git checkout --ours package-lock.json && git commit -m "Fix bullshit" && git push is always how I handle this horribleness
Follow
@TheQuinbox so true. Often I just delete it and do a regular `npm install` 😝
