Lockfile conflict merger

Resolve conflict markers in package-lock, yarn.lock or pnpm-lock files.

Runs in your browser. Your input is not uploaded.

Correctness last checked 2026-11-13. How we verify

Loading the tool…

What it does, how to use it, and questions

What it does

Merging branches often conflicts inside package-lock.json, yarn.lock or pnpm-lock.yaml. The markers are the same as any other file, but the right fix is usually to accept one side and regenerate.

This page resolves markers to ours or theirs and lists package names it can see in the hunks.

How to use it

  1. Paste the conflicted lockfile.
  2. Choose Ours or Theirs.
  3. Copy the result, then run your package manager to refresh integrity hashes.

Things to watch for

  • A marker-only resolve can leave inconsistent hashes. Treat the output as a starting point.
  • Both is rarely valid for lockfiles.

Questions

Should I edit a lockfile by hand?
Prefer resolving the package.json conflict, deleting the lockfile markers via this tool if needed, then npm install / pnpm install / yarn.
How do you detect the kind?
From lockfileVersion, importers, or yarn lockfile headers.
Is the lockfile uploaded?
No.
Can it merge JSON structurally?
No. It resolves conflict markers only.