M365Con 2027 – 無料オンラインカンファレンス · 11–22 Jan 2027 · 120 sessions m365con.net

GitHub flow

Concept

A lightweight, branch-based workflow in which anything on the main branch is deployable and work happens in short-lived feature branches merged through pull requests.

✦ CONCEPTGitHub flowM365.FM
Title graphic: GitHub flow (Concept)

あわせて取り上げられたテーマ

GitHub flowに関するエピソードでは、Trunk-based developmentも取り上げられています。

Description

GitHub flow is a lightweight, branch-based workflow for collaborating on projects. Its central rule is that anything on the main branch is deployable, so changes stay off the default branch until they have been reviewed and merged. Work happens in short-lived feature branches, and each branch is merged back through a pull request. According to GitHub Docs, GitHub itself uses this workflow for its own policy, documentation and roadmap repositories.

The workflow is not limited to software developers. The documentation presents it as useful for anyone working with files in a shared repository. Every step can be carried out in the GitHub web interface, with the GitHub CLI or in GitHub Desktop, so teams can choose the tooling that suits them.

GitHub flow consists of six steps. First, a branch is created from the default branch, ideally with a short, descriptive name, so that the default branch remains untouched. Second, changes are made on that branch using small, descriptive and isolated commits. Third, a pull request is opened, optionally as a draft, with a summary of the change and a linked issue where relevant. Fourth, review comments are addressed by pushing additional commits to the same branch. Fifth, the pull request is merged once it has been approved. Sixth, the branch is deleted to mark the work as complete.

Some details matter in practice. A merge can be blocked by conflicts or by branch protection rules, such as a requirement for a certain number of approvals. Deleting a branch after merging does not remove the pull request or its history, and a deleted branch can be restored if needed. This means the review discussion and the record of the change remain available after the branch itself is gone.

GitHub flow is usually compared with other branching strategies, and the M365.FM episode "Git Branching Strategies - Simply Explained" does exactly that. The episode covers what a branch is, why branching strategies exist and the three building blocks involved, then walks through Git Flow as the structured approach, GitHub Flow as the simple one and trunk-based development as the fast one. It also explains pull requests, discusses merge versus rebase, and addresses choosing a strategy for small and large teams as well as common mistakes beginners make. The episode frames the underlying problem as one of knowing which version of the code is the real one, which is a branching problem.

The typical decision around GitHub flow is how much process a team needs. Because it uses a single long-lived branch plus short-lived feature branches, it has fewer moving parts than a model with several permanent branches. Teams weigh this simplicity against their own release and review needs, and the choice often depends on team size and how work is shipped. Pull requests are the core mechanism in all of this: they provide the place for discussion, review and approval before a change reaches the main branch.

Overview compiled with AI from M365.FM episodes and the facts on this page. You can improve it with the edit button below.

TypeConcept

Articles about GitHub flow (1)

GitHub flowを扱った記事:

Glossary

Community wiki

Short info above, community knowledge below: add practical tips, examples or corrections. New contributions are reviewed first; trusted members publish directly.

Experts and companies for this topic

Nobody has listed this topic yet. Add it to your profile.

Sources

Maintained by Mirko Peters (Microsoft MVP) · Last updated: