How do you resolve git conflicts in yarn.lock

javascript git npm yarnpkg
Christian Schlensker picture Christian Schlensker · Mar 21, 2017 · Viewed 15.4k times · Source

When multiple git branches modify the dependencies in a project that uses Yarn, it is likely to introduce a conflict in the yarn.lock file. It is not a good idea to delete and regenerate the yarn.lock file because this will probably cause several packages to be unintentionally upgraded. What is the best way to quickly resolve conflicts in this file?

Answer

Vanuan picture Vanuan · Sep 16, 2017

Since Yarn 1.0 it's easy because it has built in support for this scenario. Just run this:

$ yarn install

yarn install v1.0.1
info Merge conflict detected in yarn.lock and successfully merged.
[1/4] Resolving packages...

Now you only have to do git add yarn.lock && git rebase --continue

Related questions

Should the package-lock.json file be added to .gitignore?

To lock the versions of dependencies that are installed over a project, the command npm install creates a file called package-lock.json. This was made since Node.js v8.0.0 and npm v5.0.0, as several of you might know. Despite of …

Read More
Bower: ENOGIT Git is not installed or not in the PATH

Git is installed and is in the path. Platform: Red Hat Enterprise Linux 5.8. >which git /usr/local/bin/git Yet bower can't find it: bower angular#1.0.6 ENOGIT git is not installed or not in the PATH What is the …

Read More
'react-scripts' is not recognized as an internal or external command

I've got a maven project, within which is JavaScript project cloned as a git sub-module. So the directory structure looks something like mavenapp/src/main/javascript/[npm project files] inside my package.json, the test looks like this : "test": "react-scripts …

Read More