docs: align superseded P13 root instructions with reviewed candidate
This commit is contained in:
+11
@@ -0,0 +1,11 @@
|
||||
{
|
||||
"failed_main": "32ca5b34c5ebe8714bd398a33e60697798ad0328",
|
||||
"submitted": "bd3a97ec741ddb2346d0c2b2e0472c978927ce82",
|
||||
"failed_checkout": "/Users/korizatou114/Projects/TheTree-managed-worktrees/p13-03/P13-03-integration-3541c11e",
|
||||
"conflict_only": "docs/plans/original-completion-2026-10-02/execution/p13-03/P13_ORDER_FINAL_REPAIR_INPUT.md",
|
||||
"reason": "Both branches added the Root historical input document; reviewed candidate adds 4-line superseded instruction header. Main still has the identical original body.",
|
||||
"resolution": "Retain entire historical body byte-for-byte; align main Root context with reviewed submitted document. No implementation or proof/acceptance changes. Retry ordinary prepare-integration against new main, same reviewed submission.",
|
||||
"old_sha256": "f7fb2ee06a96b520a3265243cb34cf48156a6a4f0d128522eaf59d6baa5d133d",
|
||||
"reviewed_sha256": "ad84f77bdff0d3caeb5315d11b2300eca50c08b196e62b758bcc7c4986426570",
|
||||
"formal_credit": 0
|
||||
}
|
||||
Reference in New Issue
Block a user