git-worktree-workflow

name	git-worktree-workflow
description	Use git worktrees for parallel Codex workflows. Run multiple Codex instances on different features simultaneously without merge conflicts. Use for parallel development, multi-branch testing, and subagent workflows.
type	reference
version	1.1.0
last_updated	"2026-01-02T00:00:00.000Z"
category	development
related_skills	["repo-sync","git-worktree-workflow"]
capabilities	[]
requires	[]
tags	[]

Git Worktree Workflow

Overview

Git worktrees allow you to have multiple working directories from a single repository, enabling parallel development workflows with Codex. This is essential for running multiple Codex instances on different tasks simultaneously.

Quick Start

# 1. Create worktree for new feature branch
git worktree add -b feature-api ../project-api main

# 2. Run Codex in worktree
cd ../project-api && Codex "Implement the feature"

# 3. After completion, merge and cleanup
cd ../project
git merge feature-api
git worktree remove ../project-api
git branch -d feature-api

When to Use

• Running multiple Codex agents on different features
• Testing changes while continuing development
• Code review with live comparison
• Parallel bug fixes across branches
• Subagent verification workflows
• A/B implementation comparisons
• CI/CD parallel job execution

Related Skills

• repo-sync - Manage multiple repositories
• sparc-workflow - Systematic development process
• agent-orchestration - Multi-agent coordination

---

Version History

• 1.1.0 (2026-01-02): Added Quick Start, Error Handling table, Metrics, Execution Checklist, Best Practices Do/Don't, updated frontmatter with version/category/related_skills
• 1.0.0 (2025-12-30): Initial release based on Codex best practices

Sub-Skills

• Best Practices
• Error Handling
• Execution Checklist
• Metrics

Sub-Skills

• What is a Worktree?
• Create a Worktree (+2)
• Pattern 1: Feature + Review (+3)
• AGENTS.md Configuration
• Headless Mode in Worktrees