GitHub

Git rebase often hangs because conflicts aren’t surfaced to the model

When git rebase stops on conflicts, Codex kept treating the run as a generic failure because parse_git_apply_output never recognized the CONFLICT (…) lines that rebase emits. The downstream tooling ...