Automatically resolve NPM package-lock conflicts using Git

Ever wondered how to get Git to automatically resolve conflicts on NPM package-lock.json files? You’re not alone. Why store package locks in Git? While an NPM package.json file allows you to specify dependencies using semver ranges, it’s still possible that there are many different combinations of package versions that satisfy these ranges. This can be …