miniblog.
← Back to all posts
Wilfred Hughes
Sep 11, 2017 at 21:02
This is nifty: yarn will resolve conflicts in lockfiles automatically!
https://github.com/yarnpkg/yarn/pull/3544
(novel? I haven't seen other tools do this)
Auto detect and merge lockfile conflicts by sebmck · Pull Request #3544 · yarnpkg/yarn
Summary Git merge conflicts are common with yarn.lock. This PR allows you to run yarn to automatically merge the two versions of yarn.lock which will run Yarn and regenerate a new lockfile. Test ...