Repository navigation

PR-B2: clean-only auto-merge for upstream sync PRs - #25

Merged

ehrvs merged 18 commits into

developfrom

local/upstream-sync-automerge

Oct 28, 2026

Merged

PR-B2: clean-only auto-merge for upstream sync PRs#25
ehrvs merged 18 commits into
developfrom
local/upstream-sync-automerge

Commits on Oct 21, 2026
- Add ghstub: fake gh on PATH for sync_gh tests
  
  ehrvs
  and
  claude
  committed
  bdf6c00
- sync_upstream: outcome table, report enrollment lines, demo mode, required_checks
  
  ehrvs
  and
  claude
  committed
  14818ad
- Add sync_gh.py: gh calls for the upstream-sync auto-merge, with tests
  
  ehrvs
  and
  claude
  committed
  c61d91d
Commits on Oct 22, 2026
- Merge branch 'prb2/t2' into local/upstream-sync-automerge
  ehrvs
  committed
  de0b4e8
- Add upstream-sync-ci workflow and sync_ci_event.py with tests
  
  ehrvs
  and
  claude
  committed
  2d10e28
- upstream-sync workflow: demo ref, enroll, issue and sweep steps; local-ci re-gates on ready_for_review
  
  ehrvs
  and
  claude
  committed
  10d073d
- Merge branch 'prb2/t3' into local/upstream-sync-automerge
  ehrvs
  committed
  51e610a
- Harden upstream-sync enrollment per Codex review (PR-B2 rev1)
  
  ehrvs
  and
  claude
  committed
  e8c1529
- Fix round-2 Codex findings: strict clean derivation, PR identity pinning, early disarm, strict enroll validation, no-change sweep
  
  ehrvs
  and
  claude
  committed
  b1bcfc4
- Fix round-3 Codex findings: carry original PR through jobs, explicit check exit, label vetoes, PR-branch issue key
  
  ehrvs
  and
  claude
  committed
  01551da
- Scan every candidate for conflict markers, disarm before artifact checks, pin demo ref to origin branch
  
  ehrvs
  and
  claude
  committed
  68f4e56
- Head-pinned veto and early merge-job disarm (round-5 findings)
  
  ehrvs
  and
  claude
  committed
  b6f3b33
- Persist conflict acknowledgement, keep pre-disarm stalled snapshot, disarm on post-arm enroll errors
  
  ehrvs
  and
  claude
  committed
  1693896
- Set and verify sync-conflict before pushing a conflict escalation
  
  ehrvs
  and
  claude
  committed
  d69e2fe
Commits on Oct 27, 2026
Commits on Oct 28, 2026
- ci: retrigger (pull_request event for 46c8c82 was not delivered)
  
  ehrvs
  and
  claude
  committed
  942d805

Navigation Menu

Repository navigation

PR-B2: clean-only auto-merge for upstream sync PRs - #25

PR-B2: clean-only auto-merge for upstream sync PRs#25
ehrvs merged 18 commits into
developfrom
local/upstream-sync-automerge

Commits on Oct 21, 2026

Add ghstub: fake gh on PATH for sync_gh tests

sync_upstream: outcome table, report enrollment lines, demo mode, required_checks

Add sync_gh.py: gh calls for the upstream-sync auto-merge, with tests

Commits on Oct 22, 2026

Merge branch 'prb2/t2' into local/upstream-sync-automerge

Add upstream-sync-ci workflow and sync_ci_event.py with tests

upstream-sync workflow: demo ref, enroll, issue and sweep steps; local-ci re-gates on ready_for_review

Merge branch 'prb2/t3' into local/upstream-sync-automerge

Harden upstream-sync enrollment per Codex review (PR-B2 rev1)

Fix round-2 Codex findings: strict clean derivation, PR identity pinning, early disarm, strict enroll validation, no-change sweep

Fix round-3 Codex findings: carry original PR through jobs, explicit check exit, label vetoes, PR-branch issue key

Scan every candidate for conflict markers, disarm before artifact checks, pin demo ref to origin branch

Head-pinned veto and early merge-job disarm (round-5 findings)

Persist conflict acknowledgement, keep pre-disarm stalled snapshot, disarm on post-arm enroll errors

Set and verify sync-conflict before pushing a conflict escalation

Commits on Oct 27, 2026

Fix sync report honesty: keep recheck counts, check on hook conflicts, legacy-hook kind, anchored marker scan

Marker scan: only <<<<<<< or >>>>>>> lines trigger; a lone ======= never does

Report honesty: partial prior counts, no zero over markers, mark skipped Go checks

Commits on Oct 28, 2026

ci: retrigger (pull_request event for 46c8c82 was not delivered)