Help

Git Branching

Last Updated - Platform 21.0 - SDK 16.0

At Poq we use the GitFlow branching strategy for our client apps with merge commits using Pull Requests that require a review.

Branches

  • The dev branch contains work in progress (if any).
  • The master branch contains the production code and a history of tagged previous releases.
  • Branches named release/ are created from dev for upcoming releases and are signed off before release.
  • Branches named hotfix/ are created from master for critical fixes that need to be released quickly.
  • We usually use feature/, bugfix/, or improvement/ for branch naming.

It is important to remember to merge and tag release branches as soon as they are released or when you pick up new work. They must be merged into master and dev before any other release branches are created.