Open jakub-g opened 11 months ago
yarn has a built-in mechanism for resolving git merge conflicts in yarn.lock; just running yarn will resolve the conflicts.
yarn
yarn.lock
However:
Additionally, as of yarn 4, this relies on the project using git. This results in yarn install throwing on hg repositories (which wasn't the case under yarn 3)
yarn
has a built-in mechanism for resolving git merge conflicts inyarn.lock
; just runningyarn
will resolve the conflicts.However: