git-workflow

Git Workflow

Three-tier branching: main (production) → staging (integration) → feature/* (development).

Core Workflow

Start Feature

git feature <name>

Creates feature/<name> from latest staging.

During Development

git add -A && git commit -m "WIP: description"
git sync  # daily - rebases on staging

Before PR

git rebase -i origin/staging     # clean WIP commits
bun build && bun lint          # verify
git push origin feature/xxx --force-with-lease
gh pr create --base staging --title "feat: description"

Merge PR

GitHub → Squash and merge

Deploy to Production

git checkout main && git pull
git merge staging --ff-only
git push origin main

After Deploy (sync staging)

git checkout staging && git pull
git merge origin/main --ff-only
git push origin staging

Merge Strategy Rules

Never squash staging → main — breaks history connection.

Quick Reference

For detailed commands, see references/commands.md:

• Hotfix workflow
• Conflict resolution
• Emergency recovery
• Weekly maintenance

Conventional Commits

type(scope): description

Types: feat fix refactor chore docs test perf

Scopes: Project-specific (e.g., cart, api, checkout, schema)

Aliases