reconcile the two mains: both lines made the same cut, one kept going

Browse Source

Diverged 2026-08-07 and each side did the SAME work. Both applied a commit
called 'one generated client in the wheel' — 2,213 files, 800,555 deletions,
and the forge retains nothing GitHub dropped. `git cherry` says the other
GitHub commit is already here under a different sha. So there is no
disagreement about the code, only two write sides doing it twice.

The forge then kept going: five client regenerations against
hanzoai/[email protected], 3.2.2 -> 3.2.7. GitHub stopped at 3.2.2.

Merged with -s ours: the histories join so GitHub can fast-forward onto this
and stop being a second head, and the tree stays the newer regeneration. Taking
the trees instead would resurrect ~140 generated modules that both sides had
already agreed to delete — the merge reported them as modify/delete conflicts
purely because the two deletions have different shas.

Co-authored-by: Hanzo Dev <[email protected]>

...

This commit is contained in:

zooqueen

2026-08-08 19:55:37 -07:00

co-authored by Hanzo Dev

parent d8bcab71a7 2ba4b9129e

commit e36789a2fb

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available