Git Workflow

Git Workflow

main is the merged, runnable baseline. Work happens on feature branches, reviewed via PR, then merged.

git checkout main
git pull
git checkout -b feature/<thing>
# ...build, commit...
git push -u origin feature/<thing>
# open PR → teammate reviews → merge → both pull main

Conventions

• Commit style (Conventional Commits): feat:, fix:, chore:, refactor:, docs:, test:
• Branch names: feature/<thing>, fix/<thing>
• Always pull main before starting a new branch.

Notes for this two-dev team

• Because features ship as self-contained slices (see Architecture), merge conflicts on shared files are rare — keep it that way by not editing other slices' files.
• If you change seed data (e.g. usernames), say so in the PR and tell your teammate to reset their DB after merge (see Database and Migrations).