Git and worktrees
Cone watches the thread’s repository and surfaces git state where you work: a branch chip on the composer, a changes list in the right rail, and diff views in the center pane. Remote threads run the same operations over SSH.
Diffs and conflicts
Section titled “Diffs and conflicts”The changes tab lists modified files. Opening one shows its diff in unified or side-by-side layout, and you can comment on a diff region and attach the comment to your next prompt. During a merge with conflicts, the same view filters to unmerged files and opens a conflict resolver.
Branches
Section titled “Branches”The branch chip switches branches without leaving the thread. Switching updates the file tree, the changes list, and the terminal’s view of the repository together.
Worktrees
Section titled “Worktrees”A worktree gives a branch its own checkout, so an agent can work on it while your main checkout stays untouched. Cone creates worktrees at <repo-parent>/.worktrees/<repo>/<branch-name> and keeps their threads grouped under the main repository in the sidebar.
Two behaviors worth knowing:
- Picking a branch that is already checked out in another worktree opens that worktree instead of failing on a second checkout.
- Worktrees work on remote threads too, created and switched on the remote host.
A common pattern is one thread per branch: keep the main thread on your checkout for review and questions, and give risky or parallel work its own worktree thread.