crew-commit

Crew Commit — Canonical Git Workflow

This skill guides crew members through the standard Gas Town commit workflow: pre-flight → branch → stage → commit → push → PR.

⚠️ NEVER commit directly to main. All crew work goes through branches and pull requests. The Refinery handles merges to main.

Usage

/crew-commit

Run this when you have changes ready to commit. The skill walks you through each step in order.

---

Step 1: Pre-flight Checks

Before touching anything, sync with origin and verify your state.

# Fetch latest from origin
git fetch origin

# Check current branch and status
git status
git branch --show-current

# If you're on main, STOP — create a branch first (Step 2)

If you're behind origin/main, rebase now:

git rebase origin/main

If there are conflicts, resolve them carefully before proceeding. If stuck on a rebase conflict, stop and get help rather than force-pushing.

---

Step 2: Create a Feature Branch

If you're already on a feature branch, skip to Step 3.

Branch naming convention: <type>/<short-description>

Types:

• feat/ — new feature
• fix/ — bug fix
• refactor/ — code restructuring
• docs/ — documentation only
• chore/ — maintenance, deps, config
• test/ — tests only

# Create and switch to feature branch
git checkout -b feat/my-feature-description

# Or use the crew/<name> prefix for crew-specific branches
git checkout -b crew/<your-name>/description

---

Step 3: Submodule Warning

Check for submodules before staging. Accidentally committing a submodule pointer change causes cascading failures for other crew members.

# Check if repo has submodules
cat .gitmodules 2>/dev/null || echo "(no submodules)"

# Check for dirty submodule state
git submodule status 2>/dev/null

Common submodule paths to watch: shared/, config/, vendor/

If you see changes in submodule directories:

• Do NOT git add shared/ or git add config/ unless you intentionally bumped the submodule pointer
• Submodule pointer changes should be explicit and deliberate
• When in doubt, ask before including submodule changes