Skip to content

chore: back-merge main into dev to clear v0.2.13 release-PR conflicts #202

@w7-mgfcode

Description

@w7-mgfcode

Problem

The devmain release PR (#201) reports merge conflicts. main carries 2 commits not on dev — the chore(main): release 0.2.13 release-please commit and the prior release-cut merge — and the post-v0.2.13 work on dev (inventory-status endpoint, Demand Planner / PRP-22, INITIAL relocation) touches regions that main's squashed release history represents differently, producing phantom conflicts.

Resolution

Back-merge origin/main into dev via this PR. Analysis confirmed all 11 conflicted files resolve cleanly to dev's version — dev is a strict superset of main (every "main-unique" line is a reformatted/relocated form of content dev already carries in newer shape). The resolved merge tree is byte-identical to dev's tip; the merge only records main's history as a second parent.

Effect

Once merged, dev contains main, and release PR #201 becomes conflict-free.

Metadata

Metadata

Assignees

No one assigned

    Labels

    choreNon-functional / hygiene change (no version bump)

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions