Lockfile merge conflicts, how to handle it correctly?
During a frontend development project, a new npm package was added, and conflicts were encountered...
Tags: npm, git, frontend, pnpm