---
title: "Discussion on \"How to fix package-lock.json merge conflicts (and yarn.lock, poetry.lock, go.sum) the right way\" | Hashnode"
description: "Discussion on \"How to fix package-lock.json merge conflicts (and yarn.lock, poetry.lock, go.sum) the right way\". Never hand-edit a conflicted lockfile, and never click \"Accept Both\". Resolve the manifest, then let the package manager regenerate the lock. Here is the exact command for npm, Yarn, pnpm, Poetry, uv, Cargo, Go, Composer, Bundler and Pipenv, why each one is different, and LockSettle, a free VS Code extension that runs the right one for you."
url: "https://hashnode.com/posts/locksettle-fix-lockfile-merge-conflicts/6abdd491b381eedf7657ca9d"
---

[Feed](https://hashnode.com/feed) /

Discussion

# [How to fix package-lock.json merge conflicts (and yarn.lock, poetry.lock, go.sum) the right way](https://jaytank.hashnode.dev/locksettle-fix-lockfile-merge-conflicts?utm_source=hashnode&utm_medium=feed)

Never hand-edit a conflicted lockfile, and never click "Accept Both". Resolve the manifest, then let the package manager regenerate the lock. Here is the exact command for npm, Yarn, pnpm, Poetry, uv, Cargo, Go, Composer, Bundler and Pipenv, why each one is different, and LockSettle, a free VS Code extension that runs the right one for you.

Oct 1 · 10 min read · jaytank.hashnode.dev  
Read the article

-   [#git](https://hashnode.com/tag/git)
-   [#npm](https://hashnode.com/tag/npm)
-   [#vscode-extensions](https://hashnode.com/tag/vscode-extensions)
-   [#python](https://hashnode.com/tag/python)
-   [#devops](https://hashnode.com/tag/devops)

## Written by

[JAY TANK](https://hashnode.com/@jaytank)

@jaytank

  
[View profile](https://hashnode.com/@jaytank)

Engineering insights on building and scaling modern software.

Cloud & Platform Engineer focused on building systems that scale and endure. I explore how infrastructure, automation, and engineering practices come together to support modern software teams.

## Responses

Markdown supported · ⌘↵ to post

No responses yet.