Skip to content

[Upstream Sync] Merge conflict with v1.0.129 #78

@github-actions

Description

@github-actions

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

  1. Checkout integration branch locally
  2. Run: git fetch upstream && git merge v1.0.129
  3. Resolve conflicts manually
  4. Run validation: bun install && bun turbo typecheck && bun turbo test
  5. Push resolved integration branch
  6. 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

Metadata

Metadata

Assignees

No one assigned

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions