Skip to content

Commit 8f9586e

Browse files
authored
Enhance Git flow section with diagram and explanation
Added a diagram to illustrate Git flow branching model and clarified the differences between GitHub Flow and Git flow.
1 parent 9bd5234 commit 8f9586e

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

learn-pr/github/introduction-to-github/includes/3-components-of-github-flow.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,11 @@ Now that we know the basics of GitHub we can walk through the GitHub flow and it
8484
8585
## Git flow
8686
87-
:::image type="content" source="../media/nvie-git-flow.png" alt-text="Screenshot showing a visual representation of the GitHub flow in a linear format that includes a new branch, commits, pull request, and merging the changes back to main in that order." border="false":::
87+
While GitHub Flow is a lightweight workflow designed for continuous delivery, **Git flow** is a more structured branching model often used in release-driven environments. Git flow has been around longer than GitHub Flow, and you may still see the term **`master`** used instead of **`main`** as the default branch.
8888
89+
Below is a diagram by Vincent Driessen, known by his nickname nvie, through his blog nvie.com. Here, nvie depicts the details of the Git flow.
8990
90-
While GitHub Flow is a lightweight workflow designed for continuous delivery, **Git flow** is a more structured branching model often used in release-driven environments. Git flow has been around longer than GitHub Flow, and you may still see the term **`master`** used instead of **`main`** as the default branch.
91+
:::image type="content" source="../media/nvie-git-flow.png" alt-text="Nvie's diagram of a Git branching model showing feature branches, a develop branch, release branches, hotfixes, and the master branch over time. Colored commit nodes and arrows illustrate how features are merged into develop, how release branches are created for version 1.0, how bug fixes flow back into develop, and how hotfixes are applied directly to master. Tags mark releases 0.1, 0.2, and 1.0." border="false":::
9192
9293
### Git flow Branch Types
9394

0 commit comments

Comments
 (0)