#conflicts

Codex Stalls on a Merge Conflict or Resolves It the Wrong Way

Codex hits conflict markers and stalls, picks the wrong side, or commits the markers into the file. Rebase in setup, an AGENTS.md stop-on-conflict rule, and a pre-commit hook fix it.