Branching Strategy

Branching Strategy

Panduan untuk Git branching dan workflow pengembangan di Merq.

Overview

Merq menggunakan Git untuk version control dengan struktur branch yang terstruktur.

Branch Types

Main Branches

Branch	Environment	Purpose
main	Production	Stable, deployable code
staging	Staging	Pre-production testing
dev	Development	Integration branch

Supporting Branches

Branch	Prefix	Purpose
Feature	feature/	New functionality
Bug Fix	bugfix/	Non-critical bug fixes
Hotfix	hotfix/	Critical production fixes
Release	rc/	Release candidates

Branch Diagram

                    ┌─────────────┐
                    │    main     │ ◄── Production
                    └──────┬──────┘
                           │
                    ┌──────▼──────┐
                    │   ◄── Pre-production
                    └──── staging    │──┬──────┘
                           │
              ┌────────────┴────────────┐
              │                         │
        ┌─────▼─────┐           ┌──────▼──────┐
        │ feature/001 │           │ bugfix/002  │
        │   login    │           │  dashboard  │
        └─────┬─────┘           └──────┬──────┘
              │                         │
              └────────────┬────────────┘
                           │
                    ┌──────▼──────┐
                    │     dev     │ ◄── Development
                    └─────────────┘

Naming Conventions

Feature Branches

feature/<number>-<description>

Examples:

feature/001-user-authentication
feature/002-outlet-mapping
feature/003-push-notifications

Bug Fix Branches

bugfix/<description>

Examples:

bugfix/login-redirect-issue
bugfix/pagination-not-working
bugfix/missing-validation

Hotfix Branches

hotfix/<description>

Examples:

hotfix/security-patch
hotfix/database-connection
hotfix/production-crash

Release Candidate Branches

rc/<version>

Examples:

rc/1.0.0
rc/1.2.0-beta

Workflow

1. New Feature

# 1. Update dev branch
git checkout dev
git pull origin dev

# 2. Create feature branch
git checkout -b feature/001-new-feature

# 3. Develop and commit
git add .
git commit -m "feat: add new feature"

# 4. Push to remote
git push origin feature/001-new-feature

# 5. Create Pull Request
# Target: dev branch

2. Bug Fix (Non-Critical)

# 1. Create branch from dev
git checkout dev
git pull origin dev
git checkout -b bugfix/fix-description

# 2. Fix and commit
git add .
git commit -m "fix: resolve issue description"

# 3. Push and create PR
git push origin bugfix/fix-description
# PR to: dev

3. Hotfix (Critical Production)

# 1. Create branch from main
git checkout main
git pull origin main
git checkout -b hotfix/critical-fix

# 2. Fix and commit
git add .
git commit -m "hotfix: critical fix description"

# 3. Push and create PR
git push origin hotfix/critical-fix

# PR to: main (also cherry-pick to dev)

4. Release

# 1. Create RC branch from dev
git checkout dev
git pull origin dev
git checkout -b rc/1.0.0

# 2. Final testing and fixes
# No new features!

# 3. Merge to staging for testing
git checkout staging
git merge rc/1.0.0

# 4. After testing, merge to main
git checkout main
git merge rc/1.0.0

# 5. Tag the release
git tag -a v1.0.0 -m "Release version 1.0.0"
git push origin v1.0.0

Pull Request Rules

Requirements

• Minimum 1 reviewer approved
• All CI checks passed
• No merge conflicts
• Tests passing (if applicable)

PR Title Format

<type>: <description>

Types: feat, fix, hotfix, refactor, docs, chore

Examples:

feat: add user authentication flow
fix: resolve pagination issue in outlets list
hotfix: critical security patch
docs: update API documentation

Commit Message Format

<type>(<scope>): <description>

Types: feat, fix, docs, style, refactor, test, chore

Examples:

feat(auth): add JWT token refresh
fix(handlers): resolve nil pointer in user handler
docs(readme): update installation steps

Protected Branches

Branch	Who Can Push	Who Can Merge
main	CI/CD only	Maintainers
staging	CI/CD	Maintainers
dev	Developers	Maintainers

Feature Numbering

Gunakan issue tracker atau task management untuk feature numbers:

feature/001-user-login
feature/002-user-registration
feature/003-password-reset
...

Increment number untuk setiap feature baru.

Best Practices

1. Branch dari branch yang benar

   • Features → dari dev
   • Bug fixes → dari dev
   • Hotfixes → dari main

2. Buat branch kecil dan sering

   • Setiap branch harus menyelesaikan satu masalah
   • Lebih mudah di-review dan di-merge

3. Commit sering

   • Commit early, commit often
   • Setiap commit harus masuk akal secara independen

4. Update branch secara berkala

   • Rebase dari parent branch secara berkala
   • Hindari merge conflict yang besar

5. Hapus branch setelah merge

   • Branch yang sudah di-merge harus dihapus
   • Jaga repository tetap bersih

Quick Reference

# Update dev
git checkout dev && git pull

# Create feature
git checkout -b feature/001-my-feature

# Create bugfix
git checkout -b bugfix/my-fix

# Create hotfix
git checkout main && git pull && git checkout -b hotfix/my-fix

# Interactive rebase (sebelum push)
git rebase -i HEAD~3

# Cherry-pick commit ke branch lain
git cherry-pick <commit-hash>

Related Documentation

• Development Workflow
• Code Style Guide
• Testing Guide