Gitflow

A [[git]] workflow.

Do you need it?

If you're doing a continuously deployed web app, maybe not. The gitflow creator noted 10 years after its inception, that it doesn't fit all project types: https://nvie.com/posts/a-successful-git-branching-model/

Details

This workflow doesn’t add any new concepts or commands beyond what’s required for the Feature Branch Workflow. Instead, it assigns very specific roles to different branches and defines how and when they should interact.

– Gitflow Workflow | Atlassian Git Tutorial

In addition to feature branches, it uses individual branches for preparing, maintaining, and recording releases.

– Gitflow Workflow | Atlassian Git Tutorial

The master branch stores the official release history, and the develop branch serves as an integration branch for features.

– Gitflow Workflow | Atlassian Git Tutorial

The develop branch contains the complete history of the project, whereas master contains an abridged version. <- why/in what way is master abridged?

feature branches use develop as their parent branch. When a feature is complete, it gets merged back into develop.

– Gitflow Workflow | Atlassian Git Tutorial

feature branches combined with the develop branch is, for all intents and purposes, the Feature Branch Workflow. But, the Gitflow Workflow doesn’t stop there.

– Gitflow Workflow | Atlassian Git Tutorial