berry icon indicating copy to clipboard operation
berry copied to clipboard

[docs] Document git conflict resolution capabilities

Open jakub-g opened this issue 2 years ago • 1 comments

yarn has a built-in mechanism for resolving git merge conflicts in yarn.lock; just running yarn will resolve the conflicts.

However:

  • this is nowhere documented (except some AUTOMERGE error codes), hence not discoverable
  • it would be great to know how the algorithm exactly works under the hood.

jakub-g avatar Oct 13 '23 09:10 jakub-g

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)

proyectoramirez avatar Jun 11 '24 21:06 proyectoramirez