mirror of
https://github.com/lux-apps/papers.git
synced 2026-10-30 18:15:21 +00:00
Both sides had a month of work and 89 files collided. Resolved by two rules, in order. FIRST, a deletion that states its reason stands. Thirteen files came back as "deleted by us, modified by them": eight the compliance sweep removed because we hold no licence for securities/ATS/BD/TA material, five a dropped cross-stack audit. A merge that resurrects them republishes exactly what that sweep took down, so they stay deleted. The one file the other side deleted goes too — it is a .github workflow, and CI has one path now. SECOND, for the rest, the later edit wins — EXCEPT where the other lineage carries a correction this one never received. It never received "replace fabricated DEX perf claims with measured numbers", so on the twenty-seven files that commit touched its numbers win regardless of date. Recency would have republished 9.13B orders/sec over a measured 104--126M fills/sec: the same claim the correction was written to remove, restored because it was typed later. Everything new on the other side arrives: AIVM, the trust-fabric and entropy papers, the research library. Co-authored-by: Hanzo Dev <[email protected]>