Problem
The dev → main 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.
Problem
The
dev→mainrelease PR (#201) reports merge conflicts.maincarries 2 commits not ondev— thechore(main): release 0.2.13release-please commit and the prior release-cut merge — and the post-v0.2.13 work ondev(inventory-status endpoint, Demand Planner / PRP-22, INITIAL relocation) touches regions thatmain's squashed release history represents differently, producing phantom conflicts.Resolution
Back-merge
origin/mainintodevvia this PR. Analysis confirmed all 11 conflicted files resolve cleanly todev's version —devis a strict superset ofmain(every "main-unique" line is a reformatted/relocated form of contentdevalready carries in newer shape). The resolved merge tree is byte-identical todev's tip; the merge only recordsmain's history as a second parent.Effect
Once merged,
devcontainsmain, and release PR #201 becomes conflict-free.