Automatic replay of fork commit d99031ee99ab61260262f38adc00fa750e8c11cc onto rust-v0.153.1 failed.
Patch source: main
Patch commit: 13c8981a71a678abdacc0ad53c240acb1975f35c
Upstream commit: 985641272869835d01d025ed2a218fbbce35fa9f
Upstream main snapshot: 32c303c197e437cb13d444389d651fbaae02a6ed
Agent base branch: ccu/agent-base/0.153.1-r1
Expected release branch: ccu/release/0.153.1-r1
Conflicted paths:
codex-rs/tui/src/bottom_pane/approval_overlay.rs
codex-rs/tui/src/bottom_pane/status_line_setup.rs
codex-rs/tui/src/chatwidget.rs
codex-rs/tui/src/chatwidget/constructor.rs
codex-rs/tui/src/onboarding/auth.rs
The release branch was not created or overwritten. Once the trusted agent base branch points at the upstream commit, the CCU conflict resolver will prepare a reviewed release branch or mark this issue for migration.
Automatic replay of fork commit
d99031ee99ab61260262f38adc00fa750e8c11ccontorust-v0.153.1failed.Patch source:
mainPatch commit:
13c8981a71a678abdacc0ad53c240acb1975f35cUpstream commit:
985641272869835d01d025ed2a218fbbce35fa9fUpstream main snapshot:
32c303c197e437cb13d444389d651fbaae02a6edAgent base branch:
ccu/agent-base/0.153.1-r1Expected release branch:
ccu/release/0.153.1-r1Conflicted paths:
The release branch was not created or overwritten. Once the trusted agent base branch points at the upstream commit, the CCU conflict resolver will prepare a reviewed release branch or mark this issue for migration.