tick-history: 2026-04-29T04:51Z — seventh merge wave + bare-main rule shard

docs/hygiene-history/ticks/2026/04/29/0451Z.md

@@ -0,0 +1 @@
+| 2026-04-29T04:51:30Z | claude-opus-4-7 | 26f978a2 | seventh merge wave + bare-main-ambiguity rule landed. Two more PRs squash-merged onto main: PR #771 (recalibration + verbatim + Confucius cold-readability second-merge-wave shard) and PR #773 (sixth thread-drain shard). 14 PRs total this session arc. PR #772 thread fixes pushed: (a) canonical-name consistency — picked `arithmetic-inconsistency` over `arithmetic-consistency lint` (the failure IS inconsistency in arithmetic); (b) softened the "in the recurring-fix-class catalog" claim — no tracked catalog file exists, the patterns live inline in tick-history shards. Amara packet arrived this tick on bare-`main` ambiguity in automation: my scripts have been hitting `fatal: 'main' matched multiple (2) remote tracking branches` repeatedly, then continuing past the failure with `git reset --hard origin/main` etc. as if successful — producing wrong downstream working-tree state. PR #775 opened with the generic memory file: rule applies to ANY multi-remote repo (not just Zeta's LFG ↔ AceHack setup, since future-Claude might be dropped into recovery on a different multi-remote repo per Aaron's note). Local safety-belt set: `git config checkout.defaultRemote origin`. Best preserved line (Amara): *"Bare `main` is for humans. Automation uses explicit refs."* This very tick's branch creation now uses explicit `git switch --detach refs/remotes/origin/main` per the rule. | [#771 merged](https://github.com/Lucent-Financial-Group/Zeta/pull/771), [#773 merged](https://github.com/Lucent-Financial-Group/Zeta/pull/773), [#772](https://github.com/Lucent-Financial-Group/Zeta/pull/772) [#775](https://github.com/Lucent-Financial-Group/Zeta/pull/775) | Trajectory observation: this tick demonstrates the verbatim-preservation gravity-well concern Amara raised — instead of folding the bare-main packet into the existing verbatim-preservation file, opened a focused new memory file for a discrete operational discipline. Search-before-canonizing applied (no existing canonical home). Best keeper from Amara: *"Multiple mains are fine. Ambiguous main in automation is not."* This rule is the kind of discrete operational guard that should live in its own home, not absorbed into a verbatim-record file. |