Conflict markers committed on main: docs/ARCHITECTURE.md (16 hunks), fpga/openxc7-synth/d6_blink.xdc (1), generated learn pages #1500

grep -rn '^<<<<<<< ' --include='*' on current main finds:

• docs/ARCHITECTURE.md — 16 <<<<<<< Updated upstream / ======= Stashed changes hunks (a committed git stash pop conflict). The "Stashed changes" side carries the richer content (Strand table with Code/Connections columns).
• fpga/openxc7-synth/d6_blink.xdc — 1 hunk; both sides agree on the pins (clk U22, led R23, LVCMOS33), the difference is only the header comment (upstream names XC7A100T-1FGG676C + D6/R23; stashed adds U22 = 50 MHz oscillator).
• apps/website/public/learn/{cards.json,index.html,sitemap.xml,a-whole-network/,ai-numbers/} and apps/website/public/ru/learn/{index.html,a-whole-network/,ai-numbers/} — generated files; a full node scripts/course-pages.mjs run rewrites them (the checkout also has stale course ids, e.g. a-whole-network, that no current course emits).

Fix: resolve the two source files by hand (they are a docs prose file and an XDC constraints file, both foreign-format by the own-language rule's plumbing exception), delete stale generated course dirs, regenerate, commit. Do not sweep generated files by hand — the generator owns them.

Found while landing the CDC course (#1498 / #1482): that PR keeps its diff clean by restoring these two source files byte-identical to main.

🤖 Generated with Claude Code