Skip to content

[CCU sync] ccu-rust-v0.152.0-r1 needs manual rebase #49

Description

@ccu-mirror-maiden

Automatic replay of fork commit d99031ee99ab61260262f38adc00fa750e8c11cc onto rust-v0.152.0 failed.

Patch source: main
Patch commit: 13c8981a71a678abdacc0ad53c240acb1975f35c
Upstream commit: 316795b3cf2a45e90d121d9f46499d4658b2645c
Upstream main snapshot: a30fa3d830475ce83bd1b4e4e584e40e135436e9
Agent base branch: ccu/agent-base/0.152.0-r1
Expected release branch: ccu/release/0.152.0-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.

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    ccu-sync-conflictUpstream replay requires agentic conflict resolution

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions