Follow
Doing a git merge on package-lock.json is always so frustrating 😭.
@TheQuinbox so true. Often I just delete it and do a regular `npm install` 😝
@mauve I wonder how hard it would be to make a nice tool for merging that up? yarn does this ootb i think
@mauve blindly accept all the conflicts then at the end of the merge delete the file and run "npm install' again.
@mauve git checkout --ours package-lock.json && git commit -m "Fix bullshit" && git push is always how I handle this horribleness