Git: Difference between revisions
m Text replacement - "<(\/?)source" to "<$1syntaxhighlight" |
Add Git Flow term and GitHub Flow comparison |
||
| Line 103: | Line 103: | ||
== Decentralized Workflow and Branching Model == | == Decentralized Workflow and Branching Model == | ||
Now known as the "'''Git Flow'''" model. When using git for software development where you maintain long-running branches for various supported product versions and also work on the 'next' release in sprints or some development cadence, you need to use this model. '''Git Flow''' is a successful branching model for development, "main", release branches, hotfixes, etc. See https://nvie.com/posts/a-successful-git-branching-model/ | |||
In contrast, the 'GitHub Flow' model where you really only ever have one product that marches forward, the focus is on a simplified fork (branch) and Pull Request (PR) approach. This simplified model is more appropriate for simple products like documentation or a website. | |||
== Submodules == | == Submodules == | ||
Using multiple repositories to compose your project. See https://git-scm.com/book/en/v2/Git-Tools-Submodules | Using multiple repositories to compose your project. See https://git-scm.com/book/en/v2/Git-Tools-Submodules | ||