DEV Community

Discussion on: Lockfile merge conflicts, how to handle it correctly?

Collapse
 
yoursunny profile image
Junxiao Shi

I put pnpm-lock.yaml into .gitignore, so there's never a conflict.
I often build libraries rather than applications, so that I should ensure my package.json contains the proper version constraints, because the dependents of my libraries would not consider what's in my lockfiles.