From cf829fbd27835a0848cd02766de437bab5290af4 Mon Sep 17 00:00:00 2001 From: Matthew P Munger Date: Wed, 26 Aug 2026 13:53:42 -0500 Subject: [PATCH 1/3] repair: claim the conflict markers left in DECISIONS.md Claiming before writing the fix, per REPAIRS.md. The row was logged unclaimed when the ledger landed; this takes it. The PR opens now, labelled repair, so a session that fetched a minute ago can still see the claim. --- REPAIRS.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/REPAIRS.md b/REPAIRS.md index 2b52062..12b7e9c 100644 --- a/REPAIRS.md +++ b/REPAIRS.md @@ -55,8 +55,8 @@ one commit. ### Conflict markers committed into `DECISIONS.md` -- **Claimed by:** _unclaimed_ -- **Seen at:** `6f0076d` (`main`) +- **Claimed by:** `fix/decisions-conflict-markers` (PR labelled `repair`) +- **Seen at:** `6f0076d`, still present at `70bfbb3` (`main`) - **Introduced by:** `aeeca8b`, "Merge main (S8, PERSON fix) into S4", landed via PR #88 - **Symptom:** `DECISIONS.md` lines 3–13 are a literal unresolved merge @@ -68,8 +68,9 @@ one commit. `296106d`) still says "five previously-undefined product questions" and "a one-line edit". The file now has six numbered decisions, and decision 6 is not a one-line edit, so the un-counted wording is the one that is true. -- **Whoever takes it:** this is one paragraph and its owner is whoever owns - `DECISIONS.md` prose. Claim it here first, then fix it in its own commit. +- **Fix:** keep the un-counted wording, delete the stale side and the three + marker lines. Nothing else in the file is touched, and no decision's content + changes — only the intro paragraph that the merge left doubled. ## Landed From d00940c05889fbe9938b593a4641f9d00ca840c5 Mon Sep 17 00:00:00 2001 From: Matthew P Munger Date: Wed, 26 Aug 2026 13:54:24 -0500 Subject: [PATCH 2/3] fix: resolve the merge conflict left unresolved in DECISIONS.md aeeca8b committed the markers themselves -- <<<<<<< HEAD, =======, >>>>>>> origin/main -- into the intro paragraph, and PR #88 shipped them green because no check reads markdown. Keeps the un-counted wording from S4 (b9870b8) and drops the S8 side (296106d), which still said 'five previously-undefined product questions' and 'a one-line edit'. There are six numbered decisions now, and decision 6 is not a one-line edit. No decision's content changes; only the doubled paragraph. --- DECISIONS.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/DECISIONS.md b/DECISIONS.md index 8647f4c..3e7e180 100644 --- a/DECISIONS.md +++ b/DECISIONS.md @@ -1,16 +1,9 @@ # Product decisions pending sign-off -<<<<<<< HEAD The implementation resolved product questions that were previously undefined. They are reasonable defaults, but they should be confirmed (or changed) by product rather than remaining implicit in the code. Each notes where it lives so a change is a small, located edit. -======= -The implementation resolved five previously-undefined product questions. They -are reasonable defaults, but they should be confirmed (or changed) by product -rather than remaining implicit in the code. Each notes where it lives so a -change is a one-line edit. ->>>>>>> origin/main ## 1. Status is driven by mobile Performance only From 5b57e93d2b9d7786a1ef1fa8f4539d9c7ece6419 Mon Sep 17 00:00:00 2001 From: Matthew P Munger Date: Wed, 26 Aug 2026 13:54:35 -0500 Subject: [PATCH 3/3] docs: move the DECISIONS.md repair to Landed --- REPAIRS.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/REPAIRS.md b/REPAIRS.md index 12b7e9c..d202854 100644 --- a/REPAIRS.md +++ b/REPAIRS.md @@ -53,9 +53,13 @@ one commit. ## Open +_Nothing open._ + +## Landed + ### Conflict markers committed into `DECISIONS.md` -- **Claimed by:** `fix/decisions-conflict-markers` (PR labelled `repair`) +- **Claimed by:** `fix/decisions-conflict-markers` / #91 — `d00940c` - **Seen at:** `6f0076d`, still present at `70bfbb3` (`main`) - **Introduced by:** `aeeca8b`, "Merge main (S8, PERSON fix) into S4", landed via PR #88 @@ -68,11 +72,9 @@ one commit. `296106d`) still says "five previously-undefined product questions" and "a one-line edit". The file now has six numbered decisions, and decision 6 is not a one-line edit, so the un-counted wording is the one that is true. -- **Fix:** keep the un-counted wording, delete the stale side and the three - marker lines. Nothing else in the file is touched, and no decision's content - changes — only the intro paragraph that the merge left doubled. - -## Landed +- **Fix:** kept the un-counted wording, deleted the stale side and the three + marker lines. Nothing else in the file was touched, and no decision's content + changed — only the intro paragraph that the merge left doubled. ### F4's field rename left S7's callers and fixtures behind