yarnpkg/yarn

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

Open

#5 382 ouverte le 20 févr. 2018

Voir sur GitHub
 (11 commentaires) (9 réactions) (1 assigné)JavaScript (2 731 forks)batch import
cat-featuregood first issuehelp wantedtriaged

Métriques du dépôt

Stars
 (41 514 stars)
Métriques de merge PR
 (Aucune PR mergée en 30 j)

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

Guide contributeur