Git · Junior · Question 67 of 75

What is a lockfile conflict in package-lock.json usually best resolved with?

Explanation

Lockfiles are generated, so hand-merging is error-prone. Keep package.json correct and let npm rebuild a consistent lockfile, then review the result.

Further reading

Problem with a question

Git · Junior · question 67

Test yourself

Take the Git · Junior quiz: questions and options are shuffled, and you get a review of your mistakes at the end.

Take this quiz