[docs] Document git conflict resolution capabilities

yarnpkg / berry

📦🐈 Active development trunk for Yarn ⚒

https://yarnpkg.com

BSD 2-Clause "Simplified" License

7.34k stars 1.1k forks source link

[docs] Document git conflict resolution capabilities #5787

Open jakub-g opened 11 months ago

jakub-g commented 11 months ago

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.

proyectoramirez commented 3 months ago

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)