Renn F 945ce006fd fix(git): hard-sync target branch to origin instead of bare pull ...

_sync_target_branch ran a bare `git pull` after checkout; on a workspace
clone whose local target branch diverged from origin (inevitable once
remote history is rewritten) modern git fatals with "Need to specify how
to reconcile divergent branches". On the CEO approve-and-merge path the
GitHub merge had already landed, so the failure surfaced as a spurious
400 "Merge failed" and every retry re-hit the same wedged clone.

Sync is now fetch + `reset --hard origin/<branch>` — remote-authoritative,
matching the helper's intent and self-healing the divergence for all
call sites (CEO merge, PM 409-retry sync, post-merge best-effort sync).

2026-07-19 00:06:33 +02:00

..

e2e_smoke

[2a86d1f5] CI-watch: fix the CI regression on roboco-api (#563)

2026-07-18 16:13:47 +02:00

fixtures

Feature: lifecycle canonical spec (#14)

2026-05-11 02:15:47 +02:00

foundation

Feature/video artifact verification (#537)

2026-07-16 19:49:26 +02:00

integration

feat(marketing): project-branded drafts + project badges on the X/video queues (#570)

2026-07-18 19:11:03 +02:00

property

Chore: reduce analytics complexity (#100)

2026-06-11 04:36:17 +02:00

unit

fix(git): hard-sync target branch to origin instead of bare pull

2026-07-19 00:06:33 +02:00

__init__.py

[beb8cae1] Type-gate tests/ under mypy — fix all errors and flip quality gate (#156) (#157)

2026-06-14 13:43:46 +02:00

conftest.py

[90c9474c] Auditor revival: scheduled audit trigger and reactive alert producers (#499)

2026-07-13 15:41:00 +02:00