> ## Documentation Index
> Fetch the complete documentation index at: https://docs.coddo.ai/llms.txt
> Use this file to discover all available pages before exploring further.

# Git Integration

> Manage branches, commits, merges, and worktrees - all from the Coddo UI.

Coddo includes a full **Git integration** so you never have to leave the app to manage version control. The Git view has two tabs: Branches and Changes.

## Branches tab

View and manage all your local branches:

* **Create** new branches with sanitized names
* **Switch** between branches
* **Delete** local and remote branches
* See the **current branch** highlighted
* View **ahead/behind** status compared to the remote
* Visualize branch relationships in a tree structure

## Changes tab

A visual staging area for your Git workflow:

<Steps>
  <Step title="Review changes">
    See all modified, added, and deleted files with their status indicators.
  </Step>

  <Step title="Stage files">
    Stage individual files or all changes at once. Click on a file to see its diff.
  </Step>

  <Step title="Commit">
    Write a commit message and commit your staged changes.
  </Step>

  <Step title="Push">
    Push your commits to the remote repository.
  </Step>
</Steps>

## Git and execution modes

The Git workflow differs depending on which execution mode your task uses.

### Worktree tasks

When a task runs in worktree mode, Coddo creates an isolated Git worktree with a dedicated branch (e.g. `coddo/1-fix-login`). The agent (Claude Code or Codex) works entirely inside this worktree.

Once the task is done, you **validate and merge** the branch back into the base branch from the Git view. Coddo handles:

* **Clean merges** - Automatic merge with no conflicts
* **Merge conflicts** - A conflict resolution dialog **automatically opens** when conflicts are detected, showing all conflicted files
* **Abort merge** - Cancel a merge in progress
* **Finalize merge** - Complete the merge after resolving conflicts

<Tip>You can open conflicted files in your code editor to resolve them, then finalize the merge from Coddo.</Tip>

### AI-assisted conflict resolution

When conflicts come up, the conflict dialog includes a **one-click button** that opens a new chat pre-filled with the right prompt to resolve them. The AI inspects the conflicted files, proposes a resolution, and the merge can be finalized once you accept.

### Direct tasks

When a task runs in direct mode, the agent works directly in your current working directory. Changes appear immediately in the Changes tab.

You can enable **auto-commit** in Settings (or per task) to automatically commit changes when the task completes. Otherwise, you stage and commit manually from the Changes tab.

## Push

After committing your changes, click **Push** to upload your local commits to the remote repository.

## Kanban header integration

The Kanban board header shows Git status at a glance:

* **Diff stats** - Files changed, insertions, and deletions
* **Ahead counter** - How many commits ahead of the remote. Hover to see the commit count in a tooltip
* **Commit & Push** button for quick operations