What is going on
Codex finished a task and opened a pull request. GitHub shows This branch has conflicts that must be resolved and the merge button is disabled.
It means the same lines were changed in two places: by Codex on its branch, and by someone (maybe you) on the main branch since Codex started.
Error messages you might see
Common causes
- You or someone else changed the same files on the main branch while the task was running.
- Several Codex tasks changed the same files and were merged one after the other.
- Generated or lock files (for example
package-lock.json) changed on both sides.
How to fix it
There are two safe ways. The second is often simpler for a small change.
- Resolve the conflicts. Update the Codex branch with the latest main (
git fetch, thengit merge origin/mainon the branch). Open each file git lists as conflicted, keep the right parts, remove the<<<<<<<,=======and>>>>>>>lines, run the app and the tests, then commit. - Run the task again. Close the pull request, make sure main is up to date, and ask Codex for the same change again. It starts from the current code, so there is nothing to merge by hand.
- For a conflicted lock file, do not edit it by hand. Take either version, then run your package manager's install command to rebuild it.
- Before merging, check that the app still starts and the main flows still work.
Getting help takes about a minute
No hiring, no back and forth. A real person looks at your app.
-
1
Describe it
Tell us what you need in plain words. You don't have to be technical or have an account to start.
-
2
Free 15-minute call
A verified developer calls you. Many tasks are sorted right there, and it costs nothing.
-
3
Pay after you approve
If there is more to do, you get one fixed price up front. You pay only once you are happy.
Real people, reviewed by hand
Developers who do this every day
Every developer is approved by our team before they can take a task. Describe yours and the first one who is free picks it up.
Get help
Matthew Butler
Java · Python · C/C++ · Kubernetes · Amazon Web Services
Systems Development Engineer @ Amazon Web Services
Matthew Jordan
Python · C# · Postgres · Unity · Bash Scripting · AWS · CI/CD · GitHub Actions · GitLab Pipelines · Docker · OIDC · Keycloak · Kasm
I've been working at a large software company named Kainos for 2 years, and mainly specialise in Platform Engineering. I regularly enjoy working on software products outside of work, and I'm a huge fan of game development using Unity. I personally enjoy Python & C# in my spare time, but I also specialise in multiple different platform-related technologies from my day job.
Luca Liberati
React · next.js · node.js · express · fastify · hono · postgresql · MongoDB
I work on monoliths and microservices, backends and frontends, manage K8s clusters and love to design apps architecture
Questions
Will I lose Codex's work if I resolve the conflict wrongly?
No. The branch is still there. If a merge goes wrong, use git merge --abort and start again.
When is running the task again better?
When the change is small and the conflicts are many. Starting from the current code avoids resolving them by hand.
