Skip to content
Module
Module 3 of 6Lesson 2 of 2~15 min

Branching strategy and commit messages

Branches that live too long and unreadable histories slow the whole team down. This lesson helps you understand the main branching models and when each one fits, then name your branches and write your commit messages so your teammates grasp your work at a glance.

Take this lesson: your first course is freeSee the full syllabus

Lesson objective

By the end of this lesson, you will be able to compare trunk-based development and Git flow for a given context, name a branch with a readable convention and write commit messages in the Conventional Commits format.

Topics covered

  • branching strategy
  • trunk-based development
  • Git flow
  • Conventional Commits
  • commit messages

In the glossary

Full glossary

Where it fits

Work on a branch, day to day

Which commands do I use, in what order, and how do I name my work?

Lessons in this module

  1. Everyday commands, and what can go wrong
  2. Branching strategy and commit messages (this lesson)

What you will learn in this module

This lesson is part of the course Git for PMs: ship as a team without putting production at risk

  • Work on a short-lived branch with everyday Git commands (or their GitHub equivalents), small commits named by convention, and stay in sync with main.

Related courses