Skip to content

Branching Strategy

Mandatory standards

  • Branches should represent a bounded unit of work
  • Branches should avoid unrelated changes
  • Long-running branches require extra care because they raise integration risk
  • Create a branch before starting implementation work
  • Rebase, merge, or otherwise integrate changes according to the team's approved git workflow
  • Keep review scope small enough to understand comfortably

Lifecycle alignment

Branching should support the product lifecycle described by the architecture and product standards, from development through validation, build, release, deployment, and monitoring.