Home

Welcome to the ajaejokes wiki!

Branch Strategy

---
title: Branch Strategy
---
gitGraph:
  commit id: "v0.0.0"
  commit id: "v0.0.1"
  checkout main
  branch hotfix
  branch development
  checkout hotfix
  commit id: "Fixed urgent issue"
  checkout main
  merge hotfix id: "v0.0.2"
  checkout development
  commit id: "Merge fix/..."
  branch feat/fix
  commit id: "Added new feature"
  checkout development
  merge feat/fix id: "Merge feat/add..."
  checkout main
  merge development id: "v0.1.0"

Loading

main: Every commits to the main branch is a new release

feat: New feature branch. If the release contains feature, then the minor version should be incremented.

fix: Fixing non urgent bugs, modification, patches, etc. If the release only contains fixes, then the only patch version should be incremented.

hotfix: Fixing urgent bugs or updates in directly to the main. Any hotfix should be merged to both main and development. This should increment the patch version.

``