yarnpkg/yarn

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

Open

#5382 opened on Feb 20, 2018

View on GitHub
 (11 comments) (9 reactions) (1 assignee)JavaScript (41,514 stars) (2,731 forks)batch import
cat-featuregood first issuehelp wantedtriaged

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

Contributor guide

Tech stack
javascriptnodejs
Domain
clideveloper experiencetooling
Issue type
feature
DifficultyEstimated implementation difficulty for a new contributor, from 1 for very small changes to 5 for expert-level work.
3
Estimated timeA rough time range for an experienced contributor to investigate, implement, test, and prepare a pull request.
1-3 hours
Activity statusHow available the issue appears right now: fresh, active, stale, blocked, or waiting on maintainer input.
stale
ClarityHow clearly the issue explains the expected change, acceptance criteria, and next step.
clear
Prerequisites
basic understanding of yarnknowledge of merge conflicts
Newbie friendlinessA 1-100 score estimating how approachable this issue is for first-time contributors.
30
Research direction
The issue proposes adding a way to override ` install.frozen lockfile true` from `.yarnrc` during `yarn install`, or a new `yarn resolve merge` command. Review the discussion and linked issues/comments (e.g., #5382) for prior art and maintainer feedback. Since yarn 1.x is frozen, consider if this feature could be implemented in Berry (yarn 2+) or if a workaround exists. Check if any config file parsing changes are needed in `src/cli/commands/install.js` or similar.