What you will learn
- Compare trunk-based and GitFlow
- Understand PR workflows
- Map to release cadence
New to this? Start here
The basics, in plain English
A workflow is just the team agreement for how everyone uses branches and merges together. There is no single right answer; teams pick a style that fits how often they ship.
- Workflow
- The shared rules a team follows for branching, reviewing, and merging code.
- Pull request (PR)
- A request to merge your branch, where teammates review the changes first.
- Trunk-based
- A style where everyone commits to one main branch often, in small pieces.
- GitFlow
- A more structured style with long-lived branches for features and releases.
- Fork
- Your own personal copy of someone else’s repo, common in open source.
01
Models
Trunk-based favors short-lived branches and continuous integration. GitFlow uses long-lived develop/release branches. Most modern teams lean trunk-based.
Finished this topic?
Mark it done to earn 100 XP and keep your streak alive.