My Profile Photo

Sheogorath's Blog

Depending on the time of the day a friend, a colleague, a wise guy. The beauty of the world is its sense of humor to show humans their way by letting them search their own.

Cover image for this blog post

Yarn and merge conflicts

Today I learned that yarn can resolve merge-conflicts on its own. If your yarn.lock has a conflict during a local merge, just run yarn and the package manager will resolve the conflict in the lock-file for you.

I came across this wile checking for an efficient way to solve merge conflicts while developing the new markdown-spellchecker version.