The sync hit merge conflicts on 2026-08-31:
docs/en/reference/slash-commands.md
docs/zh/reference/slash-commands.md
packages/agent-core-v2/docs/wire-manifest.d.ts
Resolve manually:
git fetch upstream
git checkout -b sync/manual fork/main
git merge upstream/main # resolve conflicts
git push origin sync/manual
gh pr create --base fork/main --head sync/manual
This issue stays open while the conflict persists; a conflict-free sync closes it.
The sync hit merge conflicts on 2026-08-31:
docs/en/reference/slash-commands.md
docs/zh/reference/slash-commands.md
packages/agent-core-v2/docs/wire-manifest.d.ts
Resolve manually:
git fetch upstream
git checkout -b sync/manual fork/main
git merge upstream/main # resolve conflicts
git push origin sync/manual
gh pr create --base fork/main --head sync/manual
This issue stays open while the conflict persists; a conflict-free sync closes it.