yarnpkg/yarn

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

Open

#5.382 aberto em 20 de fev. de 2018

Ver no GitHub
 (11 comments) (9 reactions) (1 assignee)JavaScript (2.731 forks)batch import
cat-featuregood first issuehelp wantedtriaged

Métricas do repositório

Stars
 (41.514 stars)
Métricas de merge de PR
 (Nenhuma PRs mesclada em 30d)

Description

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

Guia do colaborador