microsoft / microsoft/apm

[BUG] `apm install` should support automatic merge conflict resolution through forced reinstallation.

Open
#2,979 2 comments 0 reactions 0 assignees View on GitHub

Nobody has claimed this yet.

area/cli area/lockfile status/accepted theme/security triage/recommended type/bug
Dominant language
Python
Stars
3.8k
Forks
362
Avg merge
1d 17h
Merged PRs (30d)
132

Description

Describe the bug
Currently, if there is a merge conflict in the apm-lock.yaml lockfile, the apm install command fails. Most, if not all, of the package managers currently resolve this automatically but simply running the install command as if there was no lockfile.

To Reproduce
Steps to reproduce the behavior:

  1. Add a merge conflict fence to the lockfile: <<<<<<< HEAD
  2. Run apm install
  3. See error

Expected behavior
APM handles the conflict by running a forced install.

Contributor guide

Open the contributing guide

First steps

  1. Read the whole issue, then the project's contributing guide.
  2. Comment on the issue to say you are picking it up — it saves two people doing the same work.
  3. Fork the repository and make your change on a branch.
  4. Open a pull request that references the issue number.

Research direction

Start at the apm install command entry point and reproduce the failure with a merge-conflict fence in apm-lock.yaml. Trace how the lockfile error is handled and verify the command falls back to a forced install when the conflict is present. Done means apm install succeeds for the described conflict instead of failing.

Written by the indexing model from the issue text.

Assessment

Tech stack
python
Domain
cli, tooling
Issue type
Bug
Difficulty
3/5
Estimated time
1-2 days
Activity status
Active
Clarity
Mostly clear
Newbie friendliness
64/100

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.