3 ms·
> safely merging YAML diffs however could be trouble Yarn will actually do the merging automatically — if you have conflict markers in your lockfile, just runn
by drodgers 8y ago
> safely merging YAML diffs however could be trouble
Yarn will actually do the merging automatically — if you have conflict markers in your lockfile, just running yarn will parse them along with the rest of the file and produce a new lockfile with the changes from both diffs (unless there's a genuine conflict).
I assume that this feature won't go away with the new lockfile format
- Vinnl 8y agoI hope so, but that feature wasn't there from the start: https://github.com/yarnpkg/yarn/pull/3544 https://github.com/yarnpkg/yarn/pull/3544 Hopefully they'll be able to re-use much of that work for the Yaml file.