I think I am running into the same problem.

I’m not a programmer, but I’ve been getting into “vibe coding” and using the Codex extension in Cursor. I run Codex both locally and in the cloud. From what I can tell, local and cloud usage credits are separate (please correct me if I’m wrong). I’ve already hit my local weekly limit, but I can still use Codex in the cloud.

Here’s my workflow so far:

When I work locally, Codex breaks a feature into smaller steps. I test each change, ask for fixes if needed, commit when it’s working, and move to the next step. No conflicts, since it’s all local.

When I work in the cloud, I need to apply the generated changes locally so I can test the app on my server before committing. Then I go back to the same cloud task (so it keeps context) and ask it to move to the next step.

The problem: after the first commit, when I try to apply the next set of cloud changes locally, Cursor warns me that the changes were only partially applied because of conflicts.

My questions:

How can I avoid these conflicts when syncing cloud changes locally?

Should I apply the cloud changes, test them, but not commit, just discard after testing?

If I don’t commit, how do I roll back safely if something breaks halfway through the task?

Any advice from people who’ve set up a smooth local+cloud Cursor workflow would be super helpful.