Skip to content

Git

For consistency, the git workflow will mostly mirror the site milestones.

Reserved Branches

Main - This branch is reserved for production.

Dev - This branch is reserved for staging.

Branch Naming Convention:

  • Style Guide branch: style-guide.
  • Layout Branch: layout/{layout-name} (e.g., layout/header).
  • Navigation branch: navigation.
  • Block branches: block/{block-name} (e.g., block/testimonial-block). Avoid using a branch just named blocks especially if multiple people are working on the project at once.
  • Page Layout branches: page/{page-name} (e.g., page/404).
  • Custom Features branches: feature/{feature-name} (e.g., feature/directory).
  • These are custom post types, custom functionality, etc.
  • Revision branches: revision/{revision-name} (e.g., revision/404).

The branches should coincide with the development order of the site milestones. This allows us to track site progress through github milestones and issues.

Branches should be deleted as the finished milestone is completed and merged into the dev branch unless they are still being worked on.