Skip to content

[BUG] generated_at key in apm-lock.yml is constant source of merge conflicts. #2572

Description

Describe the bug
The generated_at key is consistently causing merge conflicts. Example: if two PRs separately modify different skills in the same repo, the apm-lock.yml file is regenerated creating two mergeable diffs except for the generated_at key.

To Reproduce
Steps to reproduce the behavior:

  1. Create a monorepo. Add two skills locally.
  2. Make a change to skill A on a branch, create a PR.
  3. Make a change to skill B on a branch, create a PR.
  4. Merge PR for branch A.
  5. PR B will now have a merge conflict ONLY on the line with generated_at key.

Expected behavior
Merging unrelated changes should not cause merge conflicts.

Additional context
As far as I can tell, there is no real reason for the inclusion of a timestamp in the lockfile and suggest it should be removed. At the very least, I should be able to optionally disable it entirely.

Metadata

Metadata

Assignees

No one assigned

    Labels

    area/docs-sitedocs/src/content (Starlight), README, doc generation.area/lockfileLockfile schema, per-file provenance, integrity hashes, drift detection.priority/lowAccepted but not time-sensitivestatus/acceptedDirection approved, safe to start work.status/triagedInitial agentic triage complete; pending maintainer ratification (silence = approval).theme/portabilityOne manifest, every target. Multi-target deploy, marketplace, packaging, install.type/bugSomething does not work as documented.

    Type

    No type

    Projects

    Status
    In Progress

    Milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions