Any good strategies to avoid merge conflicts when using Codex, Jules, etc.?

[scottfalconer]

I tend to start tasks one at a time, let them complete, and then start the next. I know I can manually resolve the conflicts, but in a flow that's otherwise generally painless that feels like a huge diversion.

I tried asking it to rebase, but that tends to error out due to resource limitations (and when I asked jules to do it, it flat out refused).

My plan is to explore structuring my tasks like I would with a human dev team - targeting specific areas / files in isolation, but was wondering if anyone else has any good tips here.

tldr: I'm lazy and would prefer to not deal with merge conflicts in an otherwise great workflow.