miniblog.

← Back to all posts
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
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 ...

Related Posts

Sep 15, 2018 at 11:04
The latest version of Rust can automatically fix lockfiles that have merge conflicts in them: https://github.com/rust-lang/cargo/pull/5831/ This is often possible with machine generated files, but it's rare to see in practice. Super convenient though.
cargo can silently fix some bad lockfiles (use --locked to disable) by Eh2406 · Pull Request #5831 · rust-lang/cargo
cargo can silently fix some bad lockfiles (use --locked to disable) by Eh2406 · Pull Request #5831 · rust-lang/cargo
Lock files often get corrupted by git merge. This makes all cargo commands silently fix that kind of corruption. If you want to be sure that your CI does not change the lock file you have commited ...