Reduce merge conflicts in package-lock.json
glebec opened this issue · comments
See https://www.npmjs.com/package/npm-merge-driver for a potential automatic solution.
Follow-up, annoyingly merge drivers are not considered part of the git repo? So you'd need to install the driver as a dev dep and write an npm script to add it on postinstall. See here for an example. @tmkelly28 since you're getting leery of adding more magic / noise to Boilermaker, this issue might not be worth solving. OTOH, dealing with package-lock.json conflicts is an annoying thing which doesn't really benefit students greatly, and this silently takes care of it most of the time.