repair: resolve the merge conflict left in DECISIONS.md - #91
Merged
Conversation
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.
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.
6 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Base commit
70bfbb332b5018e6a26cc29b99541bcdc631af6bnpm run lint,npm run typecheck,npm test -- --run(103 files / 1324 tests),npm run buildall pass.What & why
A repair, claimed in
REPAIRS.mdbefore it was written, and labelledrepair.DECISIONS.mdonmaincontains a literal unresolved merge conflict in itsintro paragraph —
<<<<<<< HEAD,=======,>>>>>>> origin/mainat lines3–13. It was committed in
aeeca8b("Merge main (S8, PERSON fix) into S4") andshipped through PR #88 with CI green, because no check reads markdown.
This is the fifth instance of the pattern R3 was written for, one layer out: two
sessions edited the same paragraph, the merge needed a human answer, and the
answer never came. Green CI is not a green
main.Changes
Three commits, deliberately separate:
cf829fb— the claim. Takes the open row inREPAIRS.md, pushed andopened as a PR before the fix existed, so a second session finds the claim
instead of writing a second fix. That is the failure mode this ledger came
from: F5 and R2 both repaired F4's caller sweep, git found no conflict, took
both copies, and fix: one PERSON caller per test file, not two #87 had to delete the duplicates.
reverted without the bookkeeping. It keeps the un-counted wording (from S4,
b9870b8) and deletes the stale side (from S8,296106d), which still said"five previously-undefined product questions" and "a one-line edit". The file
has six numbered decisions and decision 6 is not a one-line edit, so the
surviving side is the one that is true. No decision's content is touched.
Verification
npm run lintpasses (at base70bfbb3)npm run typecheckpassesnpm test -- --runpassesnpm run buildpassesgit grep -n '<<<<<<<\|=======\|>>>>>>>'finds no conflict markers left inthe repo
Notes
repairlabel is the claim's visibility, not a bypass here:mainisgreen, so
base-branch-greenpasses on its own merits and nothing is waived.defect was a merge left unresolved, not a missing check, and R3's rule is that
a process defect gets a process fix. If we later want conflict markers to be
impossible to commit, that is its own small change and its own argument.