Automatic replay of fork commit d99031ee99ab61260262f38adc00fa750e8c11cc onto rust-v0.152.1 failed.
Patch source: main
Patch commit: 13c8981a71a678abdacc0ad53c240acb1975f35c
Upstream commit: 5adb68a49933ae446bf11935662c83dba55a0804
Upstream main snapshot: 577a4fcd065e07fab24db2d208d825c67558b8a5
Agent base branch: ccu/agent-base/0.152.1-r1
Expected release branch: ccu/release/0.152.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.152.1failed.Patch source:
mainPatch commit:
13c8981a71a678abdacc0ad53c240acb1975f35cUpstream commit:
5adb68a49933ae446bf11935662c83dba55a0804Upstream main snapshot:
577a4fcd065e07fab24db2d208d825c67558b8a5Agent base branch:
ccu/agent-base/0.152.1-r1Expected release branch:
ccu/release/0.152.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.