yarnpkg/yarn

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

Open

#5382 aperta il 20 feb 2018

Vedi su GitHub
 (11 commenti) (9 reazioni) (1 assegnatario)JavaScript (2731 fork)batch import
cat-featuregood first issuehelp wantedtriaged

Metriche repository

Star
 (41.514 star)
Metriche merge PR
 (Nessuna PR mergiata in 30 g)

Descrizione

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

Guida contributor