Skip to content

Commit 163abbd

Browse files
authored
Merge pull request #53534 from camihmerhar/adding-nvie-git-flow-image-and-citation
Adding nvie git flow image and citation - approved merge w Learn Content.
2 parents 2b8e8b9 + 3b1bdff commit 163abbd

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ Now that we know the basics of GitHub we can walk through the GitHub flow and it
8686
8787
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+
:::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":::
90+
91+
*Image by Vincent Driessen, from ['A successful Git branching model'](https://nvie.com/posts/a-successful-git-branching-model/)*
92+
8993
### Git flow Branch Types
9094
9195
Git flow uses several long-lived and temporary branches:
122 KB
Loading

0 commit comments

Comments
 (0)