Trunk-Based Development

Trunk-Based Development sits at the heart of git workflows in Git. This guide walks through the concept step by step, with examples, a cheatsheet, and common mistakes to avoid.

Trunk-Based Development Overview

Trunk-Based Development lets you work with Git in a way that stays clear, repeatable, and easy to scale. Instead of ad-hoc steps, you follow a pattern that other developers recognise immediately.

The key is to keep trunk-based development focused and predictable. Start from the minimal example here, then add only the complexity your situation actually needs.

# a simple feature-branch workflow
git switch -c feature/cart      # branch per feature
git commit -m "feat: add cart"  # conventional commit
git push -u origin feature/cart # open a pull request
# review, then squash-merge to main

A branching workflow plus commit conventions keeps team history clean and predictable.

Trunk-Based Development Example

git add <files>
git commit -m "message"
git push origin <branch>

Start from a minimal Trunk-Based Development example and grow it only as needed.
Keep things explicit so Trunk-Based Development behaves the same for everyone on the team.
Name things clearly so teammates understand your Trunk-Based Development at a glance.
Verify Trunk-Based Development works as expected before relying on it in important work.

Git Cheatsheet

Handy Git command reference related to trunk-based development.

Task	Command	Purpose
Status	`git status`	See what changed
Stage	`git add <file>`	Prepare changes to commit
Commit	`git commit -m "msg"`	Record a snapshot
Branch	`git switch -c name`	Create and switch branch
Merge	`git merge branch`	Combine histories
Push	`git push origin main`	Share commits
Pull	`git pull origin main`	Get others' commits
Undo	`git restore <file>`	Discard local changes

How Trunk-Based Development Works in Git

Trunk-Based Development builds on Git's model of snapshots and references. Every commit points to a full snapshot of your project, and branches are simply lightweight pointers to commits.

A branching workflow plus commit conventions keeps team history clean and predictable.

The working directory, staging area, and repository are Git's three main areas.
Commits are immutable snapshots linked to their parents.
Branches and tags are just pointers to commits.
Remotes are copies of the repository you sync with.

Practical Guidance for Trunk-Based Development

On real teams, trunk-based development works best with small, focused commits and clear messages. Commit often, write descriptive messages, and pull before you push to avoid surprises.

Habit	Why it helps
Small commits	Easier to review and revert
Clear messages	History explains the why
Branch per feature	Isolates work in progress
Pull before push	Avoids avoidable conflicts

Common Mistakes

Skipping edge cases and error handling when using trunk-based development.
Not verifying the result of trunk-based development before moving on.
Over-complicating trunk-based development before you actually need the extra flexibility.
Ignoring documentation, which makes trunk-based development hard for the next person to follow.

Key Takeaways

Trunk-Based Development is a core part of working effectively with Git.
Start small and keep trunk-based development focused on a single goal.
Apply consistent patterns so trunk-based development scales across your project.
Practise and document trunk-based development to keep your workflow maintainable.

Pro Tip

When you get stuck on trunk-based development, reduce it to the smallest example first — most Git problems become obvious once the noise is gone.