yarnpkg/yarn

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

オープン

#5,382 opened on 2018/02/20

 (11 件のコメント) (9 件のリアクション) (1 人の担当者)JavaScript (2,731 件のフォーク)batch import
cat-featuregood first issuehelp wantedtriaged

Repository metrics

Stars
 (41,514 個のスター)
PR merge metrics
 (PR metrics pending)

説明

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).

コントリビューターガイド