package-lock.json. These conflicts are tough to resolve, because your
package-lock.json is not easy to read, and is, say, 30,000 lines long. What do you do?
When you hit to conflict, on the the conflicting Git SHA, run the following command. Your lockfile will be regenerated, conflict resolved:
$ npm install --package-lock-only
From the resolving lockfile conflicts docs: