Merge remote-tracking branch 'origin/main' into garrytan/workspace-aware-ship

Browse Source

Proper two-parent merge (previous 'merge' commit a64d70ba was mistakenly
a single-parent commit after stash-pop cleared .git/MERGE_HEAD, which is
why GitHub's pull_request CI workflows didn't re-fire on the previous
push).

Re-resolved the same four files the same way:
- VERSION / package.json -> v1.11.0.0 (kept from prior rebump)
- bin/gstack-config -> merged workspace_root + gbrain keys
- CHANGELOG.md -> v1.11.0.0 entry above main's v1.10.1.0 / v1.10.0.0 / v1.9.0.0

Golden ship fixtures regenerated and refreshed.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

...

This commit is contained in:

Garry Tan

2026-04-23 22:17:30 -07:00

parent 118331aa6b e3d7f49c74

commit b85752ddea

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