Git section in the details sidebar showing repository status, branches, and commit information
Workspaces provide integrated git operations for managing your code changes. These operations run on the selected registered host.
Workspace Git mutations are not available for Main Chat workspaces. Main Chat is bound to the project root; create an issue workspace when you need merge, rebase, target-branch, branch-rename, or fork workflows.

​
Git Basics for Workspaces

If you’re not familiar with git, here’s what you need to know:
A branch is a separate line of development. Think of it as a copy of your code where you can make changes without affecting the original.In Workspaces:
  • Target branch (e.g., main) - The “original” you’ll eventually merge back into
  • Working branch - Your copy where changes happen, generated from your branch prefix settings
A commit is a saved snapshot of your changes. It’s like a save point in a video game - you can always go back to it.In Workspaces, commits happen automatically as the agent works, or you can commit manually through the terminal.
A pull request is a request to merge your changes from your working branch into the target branch. It:
  • Shows all your changes in one place
  • Lets teammates review your code
  • Runs automated tests (CI)
  • Provides a history of what was changed and why
Rebasing updates your working branch relative to the target branch. It’s like saying “pretend I started my work from the current state of main, not the old state.”When to rebase:
  • Before creating a PR (to avoid conflicts)
  • When the target branch has new commits
  • When prompted by Jaidu
Merging combines your workspace branch changes with the target branch.The Merge action in Workspaces is a direct merge: after confirmation, Jaidu asks the selected host to merge this workspace branch into the configured target branch.

​
Repository Status

The Git section in the right sidebar shows:
InformationDescription
Repository nameCurrent repository with status
Current branchYour working branch
Target branchBranch you’ll merge into
Uncommitted changesNumber of modified files
Ahead/BehindCommits relative to target branch
Conflict indicatorShows when merge conflicts exist

​
Creating Pull Requests

Create pull request dialog with title, description, and draft mode options
Create PRs directly from your workspace.

​
Creating a PR

From the Git panel:
  1. Click Open pull request in the Git section of the right sidebar
  2. Fill in the PR details
From the command bar:
  1. Press Cmd/Ctrl + K
  2. Select Create Pull Request
PR details:
  • Auto-generate PR description with AI - Let AI write the description based on your changes
  • Title - PR title (auto-filled from task name)
  • Description - Optional details about the changes
  • Base Branch - The branch to merge into
  • Create as draft - Mark as draft PR
  1. Click Create PR
Once created, your PR appears on GitHub with your commits, description, and CI checks running.
GitHub pull request page showing the created PR with commits, checks, and comments

​
Draft PRs

Enable Draft mode when:
  • Work is still in progress
  • You want early feedback before completion
  • CI checks should run but reviewers shouldn’t merge yet

​
Multi-Repo PRs

For workspaces with multiple repositories:
  • Create PRs for each repo separately
  • Use the Repo Actions in the command bar
  • Reference related PRs in descriptions
Create PRs early to get CI feedback and enable team visibility into your progress.

​
Merging Changes

Merge the workspace branch into the configured target branch when direct merge is allowed.

​
Merge Process

From the Git panel:
  1. Click the dropdown arrow next to Open pull request
  2. Select Merge
From the command bar:
  1. Press Cmd/Ctrl + K and select Merge
After confirmation, the selected host merges this workspace branch into the target branch for that repository.

​
Before Merging

The workspace checks whether direct merge is allowed:
  • Up to date: Merge proceeds normally.
  • Behind target: Jaidu prompts you to rebase first.
  • Open pull request exists: Direct merge is blocked. Close or merge the PR before using direct merge.
  • Target branch is remote-only: Direct merge is blocked. Create a pull request instead.
Always ensure CI checks pass and code reviews are complete before merging directly into the target branch.

​
Rebasing

Keep your workspace branch up to date with the target branch.

​
Rebase Process

From the Git panel:
  1. Click the target branch dropdown (e.g., main)
  2. Select Rebase from the menu
From the command bar:
  1. Press Cmd/Ctrl + K and select Rebase
Your commits are replayed on top of the selected target branch after confirmation. If you choose a different base branch during rebase, Jaidu updates the repository target branch to that new base when it exists.

​
Handling Conflicts

Conflict resolution dialog showing list of conflicting files with resolve and abort options
If conflicts occur during rebase:
  1. The workspace shows a conflict resolution dialog
  2. List of conflicting files is displayed
  3. Resolve conflicts in your editor
  4. Mark files as resolved
  5. Continue or abort the rebase

​
When to Rebase

  • Before creating a pull request
  • When the target branch has new commits
  • Before merging to ensure a clean history
  • When prompted due to being behind target

​
Changing Target Branch

Switch the branch you’re merging into.

​
Changing the Target

From the Git panel:
  1. Click the target branch dropdown (e.g., main) in the Git section
  2. Select a new target branch from the list
From the command bar:
  1. Press Cmd/Ctrl + K and select Change Target Branch
  2. Choose the new target branch
The workspace updates to show the new ahead/behind status.

​
Forking A Workspace

Forking creates a child workspace from the current state of an existing workspace. If the source workspace has uncommitted changes, the host creates an automatic checkpoint commit first. The child workspace starts from that checkpoint on its own branch/worktree and gets its own thread history. Use fork when you want to:
  • try another approach without disturbing the current workspace;
  • hand off a checkpoint to another thread;
  • branch from Codex work before deciding which path to keep.
Forking is blocked for Main Chat workspaces. Main Chat is project-root context; create an issue workspace when you need branch/fork workflows.
For target-branch changes, use Change Target Branch instead of fork. Fork creates a child workspace; it does not mean “switch this workspace to another target branch.”

​
Pushing Changes

Push your commits to the remote repository.

​
When Push is Available

The Push command appears when:
  • You have unpushed commits
  • A pull request is open for the branch

​
Pushing

From the Git panel:
  • Click the Push button when it appears (shows when you have unpushed commits)
From the command bar:
  • Press Cmd/Ctrl + K and select Push
Commits are pushed to the remote repository.
Push is contextual - it only appears when there are changes to push and a PR exists.

​
Multi-Repository Git Operations

For workspaces with multiple repositories, manage each repo independently.

​
Per-Repository Actions

Access via command bar’s Repo Actions page:
ActionDescription
Create PRCreate PR for specific repository
MergeDirectly merge that repository’s workspace branch into its target branch when allowed
RebaseRebase specific repository
Change TargetChange target for specific repo

​
Coordinating Changes

When working across repos:
  1. Make related changes in each repository
  2. Create linked PRs referencing each other
  3. Merge in the correct order based on dependencies
  4. Verify integration after merging

​
Conflict Resolution

When git conflicts occur:

​
Conflict Dialog

The workspace displays a conflict resolution dialog showing:
  • List of conflicting files
  • Options to resolve or abort

​
Resolution Steps

  1. Open conflicting files in your editor
  2. Resolve the conflicts manually
  3. Save the resolved files
  4. Return to the workspace
  5. Continue the operation

​
Aborting

If you can’t resolve conflicts:
  • Click Abort in the conflict dialog
  • The operation is cancelled
  • Your branch returns to its previous state
Unresolved conflicts block git operations. Always resolve or abort before continuing work.

​
Best Practices

​
Branch Hygiene

  • Rebase regularly to stay current with target
  • Create PRs early for visibility
  • Use descriptive branch names
  • Delete merged branches

​
PR Workflow

  1. Complete your changes
  2. Review diffs in the changes panel
  3. Rebase if behind target
  4. Create a PR (draft if work continues)
  5. Address review feedback
  6. Merge when approved

​
Multi-Repo Coordination

  • Plan cross-repo changes upfront
  • Document dependencies between PRs
  • Merge in dependency order
  • Test integration thoroughly

​
Troubleshooting

What it means: You have modified files that haven’t been committed.Solutions:
  1. Let the agent finish its current work (it may be about to commit)
  2. Check the Changes panel to see what’s modified
  3. Commit the changes using the terminal: git add . && git commit -m "WIP"
  4. Or stash them: git stash
What it means: The target branch (e.g., main) has new commits that your working branch doesn’t have.Solution: Rebase your branch to include the new changes:
  1. Open command bar (Cmd/Ctrl + K)
  2. Select Rebase
  3. Resolve any conflicts if prompted
What it means: Your changes and the target branch’s changes modify the same lines of code.Solutions:
  1. Jaidu shows a conflict dialog listing affected files
  2. Open each conflicting file in your editor
  3. Look for conflict markers (<<<<<<<, =======, >>>>>>>)
  4. Choose which version to keep (or combine them)
  5. Save the file and mark it as resolved
  6. Continue the rebase
For complex conflicts, you can ask the agent to help resolve them. Start a new message describing the conflict.
Possible causes:
  • Not authenticated with GitHub
  • No changes to create a PR from
  • Branch doesn’t exist on remote
Solutions:
  1. Check GitHub integration in Settings → Integrations
  2. Ensure you have committed changes
  3. Try pushing the branch first using the terminal
Possible causes:
  • No remote configured
  • Authentication issues
  • Remote branch is protected
Solutions:
  1. Verify remote is configured: git remote -v in terminal
  2. Check GitHub authentication in Settings
  3. For protected branches, create a PR instead of pushing directly