The upstream sync from sst/opencode detected merge conflicts on 2026-06-14.
Upstream commits detected: 131
Conflicted files:
.opencode/opencode.jsonc,bun.lock
A draft PR was also opened/updated for review using the sync/upstream branch.
Manual intervention is required to sync the latest upstream changes into dev. Please resolve conflicts and merge manually.
The upstream sync from
sst/opencodedetected merge conflicts on 2026-06-14.Upstream commits detected:
131Conflicted files:
.opencode/opencode.jsonc,bun.lockA draft PR was also opened/updated for review using the
sync/upstreambranch.Manual intervention is required to sync the latest upstream changes into
dev. Please resolve conflicts and merge manually.