Git Workflow

Git conventions for parallel Claude Code workstreams in Conductor. Covers branching strategy, merge order, conflict prevention, shared file protection, and the checkpoint pattern. Use this skill throughout the build phase, especially when running multiple Conductor workspaces. Prevents the merge conflicts and corrupted state that kill momentum.

troyjthomas Updated 2 repo stars

File contents

troyjthomas/ios-agent-skills commit df14fa3cce

Frequently asked questions

npx get-skill add troyjthomas/git-workflow