Filing under: "How did I not know this?!?"
I am, generally speaking, conflict-averse.
But engineering, like life, guarantees the occasional conflict. And sometimes, this conflict occurs in the jungle that is your package manager's lock file.
To resolve a merge conflict in
yarn.lock, I usually just delete it and run
yarn again. This is the developer's equivalent of yelling "Tiny smoke bomb!" and running away.
Is this best practice? Probs not. Does it work? Pretty much always.
Well, today, I accidentally ran
yarn before deleting my conflict-ridden
To my delight, I got this message:
This is a thing! And I want the world to know it!!!
Yarn will try to resolve the merge conflicts in your lock file!
This feature was introduced with Yarn 1.0, it seems. Basically two years ago.
Sometimes it feels like I'm a little behind the times 😬