Detect and Fix Merge Conflicts on PRs
Resolved 💬 0 comments Opened May 16, 2026 by johnjjung Closed Jun 16, 2026
What variant of Codex are you using?
Desktop
What feature would you like to see?
The only thing that's currently missing in the PR box on the right-hand side in Codex desktop is the ability to detect merge conflicts. Right now, you have to go to the GitHub website and scroll all the way to the bottom to see which files have merge conflicts. In something like Conductor.build, it automatically detects that there are merge conflicts, and then you press a button. It essentially says "fix conflict", and it will pull all the necessary information, like the context gets injected, and it's able to resolve the conflict.
Would love to see a “conflict detected” and “fix conflict button” and a yolo mode to fix merge conflicts.
Additional information
_No response_