Docs/Git in Chorium

Git in Chorium

When an agent finishes, you save and combine its work with git — without leaving Chorium. This page covers the whole flow, and explains the git terms as they come up.

The git toolbar

Inside a workspace, a row of git actions sits in the toolbar:

Stage   Commit   Pull   Push   Merge   Log

Stage the changes you want

Stage opens a list of the files the agent changed. Tick the ones you want to include, and open any file to read a diff — a side-by-side of what changed, with additions and removals highlighted. The diff view is read-only; it's for reviewing, not editing. Staging lets you keep some changes and leave others for a separate commit.

Commit with an AI-drafted message

Commit turns your staged changes into a saved snapshot. Chorium drafts the commit message for you — a subject line and a short body describing what changed — and you can edit it before saving. This works for ordinary commits and for wrapping up a merge.

Pull and push

• Pull brings in the latest commits from your remote (for example, GitHub) so your branch is up to date.
• Push sends your commits up to the remote so they're backed up and shareable.

Both are one click in the toolbar.

Merge finished work

Merge combines branches. Because each workspace is on its own branch, merging is how a finished workspace's work rejoins the rest. The Merge menu offers:

• Merge into Main — fold this workspace's branch into the project's main branch.
• Merge Main into Workspace — pull the latest main into this workspace, so you're building on current work.
• Merge into Branch… — pick any other branch as the target.

If the two branches changed the same lines, git reports a conflict. Chorium detects it and offers to resolve conflicts with the agent's help, or to abort the merge and leave everything as it was.

Review history

Log shows the commit history for the workspace — a read-only list of what's been committed, newest first — so you can see how the work came together.