GitHub Integration

Overview

XAEIO has a full GitHub integration built into the workspace. Connect your repository, manage branches, create pull requests, and resolve conflicts — all without leaving XAEIO.

Connecting GitHub

1. Go to Settings in the workspace

2. Click Connect GitHub

3. Authorize XAEIO via OAuth (scopes: repo, read:org)

4. Select an existing repository or create a new one directly from XAEIO

5. Choose the branch to bind to

You can bind one GitHub repository per project. The binding can be changed or removed at any time.

Source Control Panel

Open the Git button in the toolbar to access the full Source Control panel:

• Repository status — Current branch, sync status, uncommitted changes
• Ahead/behind indicator — Shows how many commits you are ahead or behind the remote
• GitHub sync — Pull, push, or sync with one click

Branches

• Create branches — Create new branches from the current branch or any other branch
• Switch branches — Checkout any local or remote branch (workspace syncs automatically)
• Delete branches — Remove branches with safety confirmation for unmerged changes
• Checkout commits — Jump to any specific commit in the history

Commit History

• Browse all commits with author, date, and message
• View changed files for any commit
• See unified diffs for each file
• Create a new branch from any commit
• Revert to any past commit (creates a forward commit, never rewrites history)

Pull & Push

• Pull — Fetch and merge remote changes (always merge strategy, never rebase)
• Push — Push current branch or all branches to GitHub
• Sync — Pull then push in one operation
• Push is also available as a background operation after Design Mode changes

Pull Requests

Create and manage pull requests directly from the workspace:

• Create PR — Set title, description, and base branch. Title auto-populates from the latest commit or branch name
• View PRs — See all open, closed, and merged PRs with status badges
• Merge PR — Merge directly from XAEIO with mergeability check
• Close PR — Decline a pull request
• View PR files — See which files changed and their diffs
• Link to GitHub — Open any PR directly on GitHub

Conflict Resolution

When merge conflicts occur, XAEIO provides two resolution methods:

Manual resolution:

• View conflicted files with conflict markers highlighted
• Choose per-conflict: "Accept ours", "Accept theirs", "Accept both", or edit manually
• Stage resolved files and complete the merge

AI-assisted resolution:

• Click "Resolve with AI" to let the AI agent analyze and resolve conflicts
• The AI understands the context of both sides and picks the best resolution
• Resolved files are automatically staged

Auto-Commit

After the AI agent makes changes, XAEIO automatically:

1. Stages modified files (excluding internal XAEIO files)

2. Creates a commit with a descriptive message

3. Pushes to the remote branch (if GitHub is connected)

This also happens after closing Design Mode — changes are committed and pushed in the background.

Per-Chat Branches

Each chat conversation creates its own Git branch. This keeps different features and conversations isolated. Use Pull Requests to merge chat branches back to the main branch.

Team Collaboration with Git

When multiple team members work on the same project:

• Each person has their own workspace with isolated file paths
• Changes go to their own branches
• Use Pull Requests to merge and review each other's work
• Collaborator workspaces are automatically cloned from the linked repository

Tips

• Connect GitHub early — before generating code — so all history is tracked
• Use descriptive prompts in chat — they become commit messages
• One feature per chat keeps branches clean
• Always pull before starting work to avoid conflicts
• XAEIO never uses rebase — all merges preserve full history

Merge conflicts

When a merge cannot go through, the conflicting files are listed and each one can be resolved two ways: Resolve with AI, where the agent works through the conflict for you, or Resolve Manually, where you edit it yourself. Until every conflict is settled the merge button stays disabled and says so.

Commit messages

The commit box has Suggest message with AI — the agent reads the staged changes and proposes a message. Useful when a turn produced a dozen files and you would rather review the summary than write it.