Automatic replay of fork commit d99031ee99ab61260262f38adc00fa750e8c11cc onto rust-v0.154.0 failed.
Patch source: main
Patch commit: d3aae6e623cab0170e43899c3e0918912bfa7eed
Upstream commit: 6b9826e3aa83b1a5947db50f4332cb9c65f1b340
Upstream main snapshot: ddea03ad049142943bdbf13e937b1d67e8c1ba0c
Agent base branch: ccu/agent-base/0.154.0-r1
Expected release branch: ccu/release/0.154.0-r1
Conflicted paths:
codex-rs/cli/src/main.rs
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/chatwidget/mcp_startup.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.154.0failed.Patch source:
mainPatch commit:
d3aae6e623cab0170e43899c3e0918912bfa7eedUpstream commit:
6b9826e3aa83b1a5947db50f4332cb9c65f1b340Upstream main snapshot:
ddea03ad049142943bdbf13e937b1d67e8c1ba0cAgent base branch:
ccu/agent-base/0.154.0-r1Expected release branch:
ccu/release/0.154.0-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.