Upstream sync — unable to push to dev (2026-02-08 04:00 UTC)

[pRizz]

Automated upstream sync passed tests but failed in post-resolve finalization.

Failure stage: rebase
Branch: sync/upstream-dev-2026020804
Merge base: 8ad5262
Upstream commits behind: 12
Fork commits ahead: 495
Claude resolved conflicts/tests earlier: yes
Backup branch pushed: sync/upstream-dev-2026020804

Git output tail:

Auto-merging packages/app/src/components/terminal.tsx
CONFLICT (content): Merge conflict in packages/app/src/components/terminal.tsx
Auto-merging packages/console/app/src/routes/zen/util/handler.ts
Auto-merging packages/console/core/script/update-models.ts
Auto-merging packages/console/core/src/model.ts

Rebasing (1/17)
Rebasing (2/17)
Rebasing (3/17)
Rebasing (4/17)
Rebasing (5/17)
Rebasing (6/17)
Rebasing (7/17)
Rebasing (8/17)
Rebasing (9/17)
Rebasing (10/17)
Rebasing (11/17)
Rebasing (12/17)
Rebasing (13/17)
Rebasing (14/17)
Rebasing (15/17)
Rebasing (16/17)
Rebasing (17/17)
Could not apply 543f5c8ca... parent-dev # Merge branch 'parent-dev' into sync/upstream-dev-2026020804

Next steps:

• Inspect the backup branch and resolve any remaining rebase/push blockers.
• Re-run sync-upstream after branch policy or conflicts are addressed.