Repository navigation

Tie source-conflict markers to the register shared with Axiom - #10287

Merged

MaxGhenis merged 15 commits into

mainfrom

source-conflict-markers

Oct 20, 2026

Merged

Tie source-conflict markers to the register shared with Axiom#10287
MaxGhenis merged 15 commits into
mainfrom
source-conflict-markers

Commits on Oct 19, 2026
- Tie source-conflict markers to the register shared with Axiom
  
  MaxGhenis
  and
  claude
  committed
  cc71ea5
- Capture sources for the first source-conflict entries (HI, OH, AR)
  
  MaxGhenis
  and
  claude
  committed
  73da6d2
- Track known conflicts not yet registered in a checked backlog; pin the register at rulespec-us ff213980
  
  MaxGhenis
  and
  claude
  committed
  5aad28e
- Capture sources for IL, KS, CO and LA source-conflict entries
  
  MaxGhenis
  and
  claude
  committed
  9817ed2
- Seed the source-conflict backlog: 222 known conflicts not yet registered
  
  MaxGhenis
  and
  claude
  committed
  e99d047
- Mark Maryland's poverty-credit earned-income reading and capture the 2025 booklet page
  
  MaxGhenis
  and
  claude
  committed
  ee2e0b9
- Pin the register at rulespec-us 455d34ef; drop the Maryland item it now registers from the backlog
  
  MaxGhenis
  and
  claude
  committed
  138a0db
- Pin the register to what rulespec-us will merge first; keep drafted entries in the backlog
  
  MaxGhenis
  and
  claude
  committed
  3b1d618
- Note what the Illinois and Kansas backlog items still need
  
  MaxGhenis
  and
  claude
  committed
  901cd4b
Commits on Oct 20, 2026
- Address the independent review of 901cd4b6; move the data out of the test tree
  
  MaxGhenis
  and
  claude
  committed
  371dd6c
- Address the second review of the source-conflict guard (371dd6ce)
  
  MaxGhenis
  and
  claude
  committed
  1b81648
- Read YAML comments with PyYAML's own scanner; fail closed; close the P3 gaps
  
  MaxGhenis
  and
  claude
  committed
  c5b524b
- Slice YAML comments by offset; test the real cache hand-off; restore one qualifier
  
  MaxGhenis
  and
  claude
  committed
  46eb1c2
- Merge remote-tracking branch 'upstream/main' into source-conflict-markers
  MaxGhenis
  committed
  dbe1f63
- Pin the register to rulespec-us#1710's merge commit (5796861e)
  
  MaxGhenis
  and
  claude
  committed
  0f21a63

Commits

Commits on Oct 19, 2026

Commits on Oct 20, 2026