forked from anomalyco/opencode
-
Notifications
You must be signed in to change notification settings - Fork 3
Closed
Description
Upstream Sync Conflict Report
Trigger: Upstream sync at 2025-12-03T11:40:22.632Z
Upstream Tag: v1.0.129
Upstream SHA: 23ff6db
Conflicting Files
.opencode/command/issues.md
.opencode/command/spellcheck.md
packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
packages/opencode/src/installation/index.ts
Recommended Actions
- Checkout integration branch locally
- Run:
git fetch upstream && git merge v1.0.129 - Resolve conflicts manually
- Run validation:
bun install && bun turbo typecheck && bun turbo test - Push resolved integration branch
- Close this issue
Manual Sync Commands
git remote add upstream https://github.com/sst/opencode.git 2>/dev/null || true
git fetch upstream --tags
git checkout integration
git merge v1.0.129
# Resolve conflicts...
bun install
bun turbo typecheck
bun turbo test
git push origin integration