Branch Types

Main

Production-ready code.

  • main
  • master (legacy)

Develop

Active development branch.

  • develop
  • dev

Features

New features implementation.

  • features/home_screen_swipe
  • features/dark_mode_support

Fixes

Bug fixes and small corrections.

  • fixes/login_crash
  • fixes/api_response_null
  • fixes/merge_3

Release

Preparing release versions.

  • release/1.6.1
  • release/2.0.0

Hotfix

Critical fixes for production.

  • hotfix/payment_gateway_crash
  • hotfix/2.1.1

Tagging & Branching

TypePatternExample
Git TagvMAJOR.MINOR.PATCHv1.6.1
Release Branchrelease/x.y.zrelease/1.6.1
Internal Buildrelease/internal_release_{build}_x_y_zrelease/internal_release_51_1_6_1

Workflow

  1. Create feature/fix branches from develop.
  2. Open pull requests for code review.
  3. Merge into develop.
  4. When stable → create release/x.y.z branch.
  5. QA validates the release.
  6. Merge release into main and back into develop.
  7. Tag release → v1.6.1.

Responsibilities

BranchResponsible
MainRelease Manager
DevelopDevelopment Team
FeaturesFeature Developers
FixesAssigned Developers
ReleaseQA + Release Manager
HotfixCritical Fix Owners