You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
PR #52 (staging-49 → staging, "RFC 0025 Phase 1: per-app attestation binding quote (daemon-vouched)") is CONFLICTING against staging. Rebase it and resolve.
Task
Rebase staging-49 onto current staging.
staging is canonical for anything merged after this branch forked; preserve the PR's own semantics (per-app attestation binding quote, daemon-vouched) on top.
PR #52 (
staging-49→staging, "RFC 0025 Phase 1: per-app attestation binding quote (daemon-vouched)") isCONFLICTINGagainststaging. Rebase it and resolve.Task
staging-49onto currentstaging.stagingis canonical for anything merged after this branch forked; preserve the PR's own semantics (per-app attestation binding quote, daemon-vouched) on top.staginghas moved recently (cf. Tier-0 regression: source binding missing on fresh attested deploys (since PR #69) #70 source-binding regression, Durable per-app version ledger — provable 'this URL only ever ran these N versions' #61 version ledger) — reconcile onto the current binding path, don't reintroduce superseded logic.--force-with-lease.Acceptance
MERGEABLE.