Trunk-Based Development vs GitFlow

This generated surface maps a learner-facing curriculum unit to its canonical source routes.

Curriculum surface

• Open learner-facing unit
• Curriculum path: content/curriculum/production/semester-09-cloud-devops/module-04-ci-cd-pipelines-release-engineering/concepts/cluster-01-delivery-as-a-discipline/02-trunk-based-vs-gitflow-primary.md
• App: production
• Semester: semester-09-cloud-devops
• Module: module-04-ci-cd-pipelines-release-engineering
• Unit kind: concept
• Curation level: module_curated

Learning objectives

• Explain Trunk-Based Development vs GitFlow as a software-delivery and risk-reduction system, not just automation for builds and tests.
• Use Trunk-Based Development vs GitFlow to reason about feedback speed, artifact integrity, rollout safety, and release recoverability.
• Use git-from-the-bottom-up, pro-git to connect the learner page to pipeline stages, deployment strategies, and production-release discipline.

Prerequisites

• Comfort with containers, environment promotion, and the need for repeatable, low-risk software delivery.

Source books

• git-from-the-bottom-up
• pro-git

Source routes

Git From The Bottom Up

• /books/git-from-the-bottom-up via Git from the bottom up: Branching and the power of rebase

Pro Git

• /books/pro-git via Pro Git: Branching Workflows -- Long-Running Branches, Pro Git: Branching Workflows — Long-Running Branches, Pro Git: Distributed Workflows (centralized, integration, dictator-lieutenant), Pro Git: Private managed team workflow, Pro Git: Private small team workflow, Pro Git: Pushing and tracking branches, Pro Git: The perils of rebasing, Pro Git: Topic Branches and Remote Branches

Supporting curriculum routes

No supporting curriculum routes linked yet.

External enrichment

• Google Cloud: CI/CD and Automation (official_docs_companion) - Grounds CI/CD ideas in an end-to-end automation reference instead of tool-by-tool folklore.
• Google SRE Workbook: Canarying Releases (read_if_stuck) - Shows how release engineering decisions affect safety, confidence, and rollback strategy in production.

AI companion modes

• Explain simply
• Socratic tutor
• Challenge my understanding
• Diagnose my confusion
• Generate extra practice

Source-of-truth note

This teaching unit is learner-facing guidance assembled from multiple canonical book routes. Use the listed source books as the primary conceptual spine for Trunk-Based Development vs GitFlow, and treat outside material as supporting enrichment only.