Upstream sync — unable to push to dev (2026-02-21 03:00 UTC)

[pRizz]

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

Failure stage: rebase
Branch: sync/upstream-dev-2026022103
Merge base: 2d7c9c9
Upstream commits behind: 180
Fork commits ahead: 641
Claude resolved conflicts/tests earlier: yes
Backup branch pushed: sync/upstream-dev-2026022103

Git output tail:

...[truncated, showing last 4000 chars]
bedrock.test.ts
Auto-merging packages/opencode/test/snapshot/snapshot.test.ts
CONFLICT (content): Merge conflict in packages/opencode/test/snapshot/snapshot.test.ts
Auto-merging packages/opencode/test/tool/bash.test.ts
CONFLICT (content): Merge conflict in packages/opencode/test/tool/bash.test.ts
Auto-merging packages/sdk/js/src/v2/gen/sdk.gen.ts
Auto-merging packages/sdk/js/src/v2/gen/types.gen.ts
Auto-merging packages/sdk/openapi.json
Auto-merging packages/ui/src/components/icon.tsx

Rebasing (1/186)
Rebasing (2/186)
Rebasing (3/186)
Rebasing (4/186)
Rebasing (5/186)
Rebasing (6/186)
Rebasing (7/186)
Rebasing (8/186)
Rebasing (9/186)
Rebasing (10/186)
Rebasing (11/186)
Rebasing (12/186)
Rebasing (13/186)
Rebasing (14/186)
Rebasing (15/186)
Rebasing (16/186)
Rebasing (17/186)
Rebasing (18/186)
Rebasing (19/186)
Rebasing (20/186)
Rebasing (21/186)
Rebasing (22/186)
Rebasing (23/186)
Rebasing (24/186)
Rebasing (25/186)
Rebasing (26/186)
Rebasing (27/186)
Rebasing (28/186)
Rebasing (29/186)
Rebasing (30/186)
Rebasing (31/186)
Rebasing (32/186)
Rebasing (33/186)
Rebasing (34/186)
Rebasing (35/186)
Rebasing (36/186)
Rebasing (37/186)
Rebasing (38/186)
Rebasing (39/186)
Rebasing (40/186)
Rebasing (41/186)
Rebasing (42/186)
Rebasing (43/186)
Rebasing (44/186)
Rebasing (45/186)
Rebasing (46/186)
Rebasing (47/186)
Rebasing (48/186)
Rebasing (49/186)
Rebasing (50/186)
Rebasing (51/186)
Rebasing (52/186)
Rebasing (53/186)
Rebasing (54/186)
Rebasing (55/186)
Rebasing (56/186)
Rebasing (57/186)
Rebasing (58/186)
Rebasing (59/186)
Rebasing (60/186)
Rebasing (61/186)
Rebasing (62/186)
Rebasing (63/186)
Rebasing (64/186)
Rebasing (65/186)
Rebasing (66/186)
Rebasing (67/186)
Rebasing (68/186)
Rebasing (69/186)
Rebasing (70/186)
Rebasing (71/186)
Rebasing (72/186)
Rebasing (73/186)
Rebasing (74/186)
Rebasing (75/186)
Rebasing (76/186)
Rebasing (77/186)
Rebasing (78/186)
Rebasing (79/186)
Rebasing (80/186)
Rebasing (81/186)
Rebasing (82/186)
Rebasing (83/186)
Rebasing (84/186)
Rebasing (85/186)
Rebasing (86/186)
Rebasing (87/186)
Rebasing (88/186)
Rebasing (89/186)
Rebasing (90/186)
Rebasing (91/186)
Rebasing (92/186)
Rebasing (93/186)
Rebasing (94/186)
Rebasing (95/186)
Rebasing (96/186)
Rebasing (97/186)
Rebasing (98/186)
Rebasing (99/186)
Rebasing (100/186)
Rebasing (101/186)
Rebasing (102/186)
Rebasing (103/186)
Rebasing (104/186)
Rebasing (105/186)
Rebasing (106/186)
Rebasing (107/186)
Rebasing (108/186)
Rebasing (109/186)
Rebasing (110/186)
Rebasing (111/186)
Rebasing (112/186)
Rebasing (113/186)
Rebasing (114/186)
Rebasing (115/186)
Rebasing (116/186)
Rebasing (117/186)
Rebasing (118/186)
Rebasing (119/186)
Rebasing (120/186)
Rebasing (121/186)
Rebasing (122/186)
Rebasing (123/186)
Rebasing (124/186)
Rebasing (125/186)
Rebasing (126/186)
Rebasing (127/186)
Rebasing (128/186)
Rebasing (129/186)
Rebasing (130/186)
Rebasing (131/186)
Rebasing (132/186)
Rebasing (133/186)
Rebasing (134/186)
Rebasing (135/186)
Rebasing (136/186)
Rebasing (137/186)
Rebasing (138/186)
Rebasing (139/186)
Rebasing (140/186)
Rebasing (141/186)
Rebasing (142/186)
Rebasing (143/186)
Rebasing (144/186)
Rebasing (145/186)
Rebasing (146/186)
Rebasing (147/186)
Rebasing (148/186)
Rebasing (149/186)
Rebasing (150/186)
Rebasing (151/186)
Rebasing (152/186)
Rebasing (153/186)
Rebasing (154/186)
Rebasing (155/186)
Rebasing (156/186)
Rebasing (157/186)
Rebasing (158/186)
Rebasing (159/186)
Rebasing (160/186)
Rebasing (161/186)
Rebasing (162/186)
Rebasing (163/186)
Rebasing (164/186)
Rebasing (165/186)
Rebasing (166/186)
Rebasing (167/186)
Rebasing (168/186)
Rebasing (169/186)
Rebasing (170/186)
Rebasing (171/186)
Rebasing (172/186)
Rebasing (173/186)
Rebasing (174/186)
Rebasing (175/186)
Rebasing (176/186)
Rebasing (177/186)
Rebasing (178/186)
Rebasing (179/186)
Rebasing (180/186)
Rebasing (181/186)
Rebasing (182/186)
Rebasing (183/186)
Rebasing (184/186)
Rebasing (185/186)
Could not apply a6efe9e16... parent-dev # Merge branch 'parent-dev' into sync/upstream-dev-2026022103

Next steps:

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