[mashlol]

Why Mac only?

Also - one issue I've seen with other tools doing worktree stuff is they don't deal with merge conflicts automatically. IMO the agents should just automatically resolve conflicts & rebase on their own, is that a thing here?

[avipeltz]

We technically have a linux build, but dont maintain it as well as mac. We are built on electron so eventually we want to more heavily support linux and windows but we dont currently have anyone on the team that daily drives linux and windows the maintenance overhead is a bit too high. Once we do have someone on the team driving linux/windows we'll have broader publicized support for all platforms.

And on the worktree note, I find when working in a worktree the agent has a much easier time solving merge conflicts and as the number of feature branches scale and it just makes it so i dont have to worry about conflicts while working on a feature.

[dbbk]

Surely that's something you just instruct the model to do in your CLAUDE.md / AGENTS.md right? Not really the domain of the IDE.

[mashlol]

If you try to just instruct them they might get it wrong. If the surrounding software forces them to do it, it'll always work. E.g. it can check for merge conflict markers like <<<<<<< and re-invoke codex/claude to merge again if the previous resolution failed for whatever reason (e.g. AI hallucinated, threw up, whatever).

Also you'll need a wrapper to actually detect when merge conflicts will occur and when rebasing is necessary.

Generally, the less you rely on the AI the better. Make the AI write the code, sure, but don't make the AI be the process.

[dbbk]

I think that's being pretty uncharitable to the model... I use Opus and it has zero issue handling this