Files
gstack/VERSION
T
Garry Tan 59dc0a274f Merge origin/main into garrytan/ship-version-sync
Main bumped to v1.1.0.0 (browse Puppeteer-parity wave: load-html,
screenshot --selector, viewport --scale, file://). Resolved conflicts
to ship /ship's drift fix on top as v1.1.1.0.

Conflicts:
- VERSION: 1.0.1.0 vs 1.1.0.0 -> 1.1.1.0 (PATCH on top of main's MINOR)
- package.json "version": same resolution
- CHANGELOG.md: kept main's v1.1.0.0 entry; renamed my v1.0.1.0 entry
  to v1.1.1.0 and placed it above main's entry (next to land)

Dogfooded: new Step 12 classified the merged state correctly as
ALREADY_BUMPED (BASE=1.1.0.0, VERSION=1.1.1.0, pkg=1.1.1.0 — all synced).

Tests: bun run test green (14/14 ship-version-sync, 73/73 host-config,
full free suite exit 0).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-18 23:32:44 +08:00

2 lines
8 B
Plaintext