Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions DECISIONS.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
15 changes: 9 additions & 6 deletions REPAIRS.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,14 @@ one commit.

## Open

_Nothing open._

## Landed

### Conflict markers committed into `DECISIONS.md`

- **Claimed by:** _unclaimed_
- **Seen at:** `6f0076d` (`main`)
- **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
- **Symptom:** `DECISIONS.md` lines 3–13 are a literal unresolved merge
Expand All @@ -68,10 +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.
- **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.

## 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

Expand Down
Loading