Codex unexpectedly stuck on the simplest steps

What version of Codex is running?

codex-cli 0.56.0

What subscription do you have?

Plus

Which model were you using?

gpt-5-codex

What platform is your computer?

Darwin 25.1.0 arm64 arm

What issue are you seeing?

It just had to resolve a merge conflict. After that, it should have committed everything. I was very patient and waited 15 minutes for the last step, but then I gave up after seeing this:
Preparing to commit merge (16m 35s • esc to interrupt)

It was stuck there forever. There was no reason to take so long to prepare a commit.

What steps can reproduce the bug?

Uploaded thread: 019a659a-c5d4-7093-a266-8d0bd619e70c

What is the expected behavior?

Don't get stuck

Additional information

_No response_