Git workflows
GitHub flow
GitHub Flow appears to be well-suited for asynchronous, exploratory way of working.
- There is only one
main
branch. - Anything in the
main
branch is always deployable. - All other branches are whatever but they are always based off
main
.
GitFlow
GitFlow is ideally suited for large projects that have a scheduled release cycle.
- There are
main
,dev
, and many feature branches. - Feature branches use
dev
as a parent. - Feature branches never interact with
main
directly. - There can be
hotfix
andrelease
branches.