Trunk-Based Development

Trunk-based development uses a single main branch with short-lived feature branches.

Syntax

GIT

1
2
3

main ← single source of truth
  feature/short-lived (hours/days)
  feature/another (hours/days)

Trunk-Based Development

BASH

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15

# Short-lived branches
git checkout -b fix/header-bug

# Make changes, commit frequently
git add .
git commit -m "Fix header alignment"

# Push and create PR immediately
git push origin fix/header-bug

# After merge, delete branch
git branch -d fix/header-bug
git push origin --delete fix/header-bug

# Keep main always deployable

Try It Yourself

Previous

Git Flow

Tutorial Complete

Back to Git