Git & Worktrees

Codeg has a full git client built into the workspace, so reviewing what an agent wrote and landing it are part of the same loop as prompting — no jumping out to a separate git tool. Everything sits in panels you already have open: the Changes and Commits tabs on the right, and the branch menu — the folder-and-branch button in the title bar — for everything else. The integrated terminal is always there for the odd command, but you'll rarely need it.

Review your changes

Open the Changes tab in the right panel to see your working tree at a glance, split into Tracked changes and Untracked files. Each tracked file shows its git status (M modified, A added, D deleted, R renamed…) and a running +/− line count. Click any file to open its diff.

Those diffs are read-only — side by side, HEAD on the left and your Working Tree on the right, with Prev/Next to step through each change. They're for reading what changed, whether you or the agent made it; you decide what to keep when you commit, not by editing the diff.

Right-click a file — or a folder, to act on several at once — for the rest:

• View Diff / Open File — review the change, or open the real file to edit it.
• Add to session — hand the file to the agent as context.
• Rollback — discard a file's changes and restore it to the last commit. Destructive, and it asks first.
• Delete — for an untracked file, remove it from disk. Also destructive, also confirmed.

There's no separate staging step — Codeg doesn't make you git add before committing. You just tick the files you want when you commit (below). New files start untracked; Add to VCS begins tracking one if you'd like it in git before then.

Not a repository yet?

If the folder isn't under git, the Changes tab says so — choose Initialize Git repository from the branch menu to start one.

Commit

When you're ready to save work, Commit code — from the branch menu, the Changes tab, or a file's menu — opens a dedicated Commit window. Tick the files to include (tracked files come pre-selected, untracked ones don't), click any name to preview its diff, write a message, and commit.

The commit button doubles as a menu: Commit records the selected files, and Commit and Push sends them to your remote in the same step. Codeg stamps each commit with the author identity from your git account for that remote, so your commits are attributed correctly without you setting user.name and user.email in every project.

Branch, merge, and rebase

The branch menu in the title bar is your branch switcher and the home for most git operations. It lists your local and remote branches; pick one to switch to it, or open a branch's submenu to merge it into the current branch, rebase the current branch onto it, or delete it. New branch creates one from where you are and checks it out.

Switching uses a plain checkout, so Codeg won't move your uncommitted changes for you — commit or stash first if git would refuse. For stashing, Stash changes tucks your work away (optionally keeping the index staged), and Unstash lists your stashes to apply or drop.

Push, pull, and remotes

• Pull code fetches and merges your upstream; if the merge conflicts, Codeg opens the conflict tool (below) rather than leaving you at a half-finished merge.
• Fetch remote branches refreshes everything from your remotes without touching your working tree.
• Push opens a window listing the commits you haven't pushed yet, so you see exactly what's about to go out before it does. In the Commits tab, a cloud icon on each commit shows at a glance whether it's pushed, not pushed, or has no upstream configured.
• Manage Remotes lets you add, edit, or remove the remotes a repo points at.

Sign in to push — git accounts

Pushing over HTTPS needs credentials, and Codeg manages them for you as git accounts so you're not re-entering a token every push. Add one under Settings → Version Control:

• A GitHub account — a personal access token, with a link straight to GitHub's token page with the right scopes preselected.
• A Git account for GitLab, Bitbucket, or a self-hosted server — server URL, username, and token.

Accounts are matched to a remote by its host, with one marked Default to break ties, and the token lives in your OS keyring, never in plain text. Once an account is set:

• Your pushes and pulls just work — Codeg supplies the credentials to git automatically.
• So do the agent's. When an agent runs its own git push in the terminal, it authenticates through the same account — no separate setup.
• Commits are attributed to that account's identity.

If a git operation ever hits an auth wall, Codeg prompts inline, validates what you enter, and saves it as an account so it won't ask again. SSH remotes keep using your own SSH keys, so they don't need an account here.

→ Version Control & Git covers every field in these settings.

Resolve conflicts

When a merge, rebase, or pull runs into conflicts, Codeg catches it and offers a Merge Conflicts prompt: abort and back out, or Open Merge Tool. The tool is a three-pane editor — Local (Ours) on the left, Remote (Theirs) on the right, and an editable Result in the middle.

Work through each conflict by accepting a side — Accept Local or Accept Remote on the hunk — or by typing the resolution straight into the Result pane; this is the one diff in Codeg you can edit. Header buttons apply a whole side, or every non-conflicting hunk, at once. When a file's clean, Mark Resolved and Codeg stages it and moves you to the next. Once every file is resolved, Complete Merge finishes the operation — or Abort unwinds the whole thing.

Work in parallel with worktrees

A git worktree is a second working copy of the same repository, checked out on its own branch in its own directory. Codeg builds parallel development around them: instead of one agent at a time on one branch, you can have several agents working at once, each in its own worktree on its own branch — no stepping on each other's files, no half-finished changes bleeding between tasks.

Create one from the branch menu → New worktree. Codeg pre-fills a new branch name and a sibling directory next to your repo (both editable), runs git worktree add, and — the good part — opens a fresh conversation rooted in that worktree. Start a task there and the agent works entirely inside it.

In the sidebar, a repo's worktrees group under it, so a project's parallel branches stay together. Switching to a branch that lives in a worktree takes you to that worktree instead of checking out over your current one. The payoff: tile a few sessions side by side, each in its own worktree, and watch a fleet of agents build different features at the same time — the natural companion to multi-agent collaboration.

Automations lean on the same mechanism: each run can execute in its own throwaway worktree, so a scheduled task never collides with your working tree.

Worktrees are yours to clean up

Codeg creates worktrees but doesn't delete them. Removing a worktree's folder from the workspace closes its tabs but leaves the worktree and its branch on disk — tidy up finished ones yourself with git worktree remove (and delete the branch if you no longer need it).

Next steps

• The Workspace — the panels the Changes, Commits, and branch tools live in.
• Multi-Agent Collaboration — put those parallel worktrees to work with a team of agents.
• Automations — run tasks headlessly, each in its own isolated worktree.