shape-doctor.py: with contracts/shape-pin.yaml and a pinned copy both conflicted, the NEXT takes the taken side's copies whole, so pasting it drops a person's --accept-local edit to the copy and the doctor then says COMPLIANT #485

Lane: openreposhape-2 (openRepoShape-2)

(lane openRepoShape-2, 2026-10-12T22:22Z) Found by this lane's re-verify of #358 (at a5563c3), and filed on Brett Heap's word ("file L2-5 as a v1.0.0 issue", 2026-10-12). It replaces checklist item L2-5 on #460, its parent.

The state. A merge leaves contracts/shape-pin.yaml and a pinned copy both conflicted. Two ordinary flows reach it:

• an update-shape.py apply --branch shape/update-<sha> pull request, beside a branch where a person edited the same copy and kept the edit with apply --accept-local (the exit the doctor's own shape currency row names for a locally modified copy, and AGENTS.md's both exit), when the update author merges main or the person's branch into the update branch;
• two applies to different targets.

What the doctor says. The shape currency row's NEXT, and since #358 the manifest kinds row's too, is git -C <root> checkout --ours -- <copy> contracts/shape-pin.yaml (shape-doctor.py:2364-2407 at #358's a5563c3; on main the same command comes from #267's static copy lists, decff87).

What pasting it does.

• With the update side as ours, the copy loses the person's lines, including hunks git had merged cleanly: a naming entry in contracts/repository-naming.yaml, or a project's own target appended to the Makefile. Once the merge is finished, the doctor says COMPLIANT, exit 0. The edit survives only on the other parent.
• With the person's side as ours, their bytes are kept, the upgrade is dropped, and the doctor flags it (DRIFTED, shape-pin-manifest-disagree).
• Meanwhile the manifest kinds row's detail.restore calls the copy project (left to a person), while its own NEXT overwrites it.

Why it is in v1.0.0. A pasted NEXT drops a person's edit, and the doctor then verifies the root. #358 fixes the same mechanism for a copy conflicted on its own. Reaching it takes two concurrent branches that each re-pin, editing the same lines of one copy; a Makefile with a project block is the likeliest copy.

Fix direction (from #358's fix round, "Left as it was"):

• take only the pin whole (whole = {pin});
• put the taken side's conflicted copies in left_for_a_person, beside the manifest and README.md; a person merges each, keeping the hunks git merged, then runs update-shape.py apply --accept-local <path>, the path shape-doctor.py: the manifest kinds row puts back a shape or leg pin under contracts/ that does not load with the git command pin_restore picks from its own state, shows a copy the shape pin has a row for or a neutral product pin with a read-only git diff, and leaves any other file to a person whatever it is called, so its NEXT no longer tells the reader to delete the pin (#291) #358's tests take for a copy conflicted on its own;
• change shape-doctor.py: a root's own contracts/shape-pin.yaml that does not read as a pin (a merge conflict, a non-UTF-8 byte, a commit: that is not 40 hex, a deleted file) is INVALID, exit 1, with the git command that puts back the last pin a tool wrote as its NEXT, instead of CANNOT ANSWER, exit 3, sending the reader to git fetch --all in the standard (#237) #267's two tests that assert the copies are taken whole: test_the_issues_own_merge_takes_one_side_of_the_shapes_files_whole and test_the_issues_two_apply_merge_leaves_the_projects_manifest_to_a_person (tests/test_shape_doctor.py:4044 and :4157 at a5563c3);
• the manifest kinds detail and its NEXT then agree.

How to test. The review's probes OD and OD2 build the state with the real update-shape.py. Pin both as tests that are red on main, run every NEXT as pasted, and assert that the person's lines survive and that the doctor does not say COMPLIANT until the copy is merged.

Evidence: handoffs/xFactory/attachments/lane-openRepoShape-2/review358-a5563c3/ (final-report.md, fix-list.md F1 and F2, tools/) in opensoft/brett-wip.

Related: #358 (#291), which narrows this to the copies the taken side's pin lists; #267 (#237), which introduced the restore; #460, the parent.