yarnpkg/yarn

can't resolve merge conflicts with --install.frozen-lockfile in .yarnrc

Open

#5,382 创建于 2018年2月20日

在 GitHub 查看
 (11 评论) (9 反应) (1 负责人)JavaScript (41,514 star) (2,731 fork)batch import
cat-featuregood first issuehelp wantedtriaged

描述

Do you want to request a feature or report a bug? feature

What is the current behavior?

If a project has a .yarnrc file that specifies --install.frozen-lockfile true, then you can't take advantage of the automatic merge conflict resolution on yarn install.

What is the expected behavior?

Yarn either provides a way to override the settings in .yarnrc during yarn install (e.g. yarn install --no-frozen-lockfile), or provides a new CLI command to explicitly resolve merge conflict markers (e.g. yarn resolve-merge).

贡献者指南