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

What version of Codex is running?

codex-cli 0.47.0

What subscription do you have?

Pro

Which model were you using?

gpt-5-codex

What platform is your computer?

Darwin 25.0.0 arm64 arm

What issue are you seeing?

git rebase often hangs forever.

Why?

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 got an empty conflicted_paths, so the agent couldn’t tell which files to inspect and ended up stuck.

What steps can reproduce the bug?

Run a task that triggers git rebase with a conflict; observe the agent’s “stuck” behavior and empty conflicted_paths.

What is the expected behavior?

Rebase should complete successfully.

Additional information

_No response_