gitflow

GitFlow Workflow

GitFlow branching strategy with git worktrees for parallel development.

Branch Naming

• Feature branches: SPD-XXXX-short-description (NO feature/ prefix — branches are shared)
• Worktree directories: Sibling directories with date prefix: ../YYYY-MM-DD_SPD-XXXX-short-description

Git Worktrees — Preferred Workflow

Use git worktrees for all feature development. Worktrees allow multiple branches to be checked out simultaneously in separate directories.

Directory Structure

Replace your-repo with your actual repo directory name from TOOLS.md.

code/
├── your-repo/                           # Main repository (on master)
├── 2026-02-13_SPD-1234-fix-auth/        # Worktree for SPD-1234
├── 2026-02-14_SPD-5678-add-logging/     # Worktree for SPD-5678
└── 2026-02-15_SPD-9012-refactor-api/    # Worktree for SPD-9012

Create a Worktree

# From main repository directory (path from TOOLS.md)
cd /path/to/your/repo
git checkout master && git pull origin master

# Create worktree with date-prefixed directory
git worktree add ../YYYY-MM-DD_SPD-XXXX-short-description -b SPD-XXXX-short-description
cd ../YYYY-MM-DD_SPD-XXXX-short-description

List Worktrees

git worktree list

Remove a Worktree (after merge)

rm -rf ../YYYY-MM-DD_SPD-XXXX-short-description
git worktree prune

Core Workflow

Starting a Feature

cd /path/to/your/repo  # from TOOLS.md
git checkout master
git pull origin master
git worktree add ../YYYY-MM-DD_SPD-XXXX-desc -b SPD-XXXX-desc
cd ../YYYY-MM-DD_SPD-XXXX-desc

Working on a Feature

# Make commits as you work
git add .
git commit -m "Add login validation (SPD-1234)"

# Regularly sync with master
git fetch origin master
git merge origin/master

# Push feature branch
git push -u origin SPD-XXXX-desc

Completing a Feature

For this workflow, completion means creating a GitLab MR (not merging locally). GitLab handles the merge after approval. See the glab-speedscale skill for MR creation.