Auto git conflict cleanup for lockfiles

[Yohe-Am]

Ghjk lockfiles are expensive to generate as they require resolving information from multiple registries instead of one like most package manager. When a merge conflict occurs in the file, as it does so often, deleting and re-generating is not an ideal solution. It should be possible to cleanly resolve or mostly recover lockfiles that are corrupted by git conflicts.

PNPM has such a feature implemented.

[linear]

MET-555 Auto git conflict cleanup for lockfiles