/git-workflow

What it is

Trunk-based development, Conventional Commits, PR template and review checklist, merge strategies, and conflict resolution.

Called by

• /gaia-dev-story (branching, commits, PR creation)
• All stack dev agents

What it does

Defines the branching strategy: trunk-based development with short-lived feature branches (max 2-3 days).

Documents Conventional Commits format: type(scope): description.

Provides PR template and review checklist structure.

Covers merge strategies (squash, merge, rebase) and conflict resolution approaches.

When you will see it surface

• When /gaia-dev-story creates branches, commits, and PRs, it follows these conventions.

Technical notes

• Never commit directly to main. Delete branches after merge.
• Branch naming: {type}/{ticket-key}-{short-description}.
• Conventional commit types: feat, fix, refactor, chore, perf, docs, style, test.