So, I built a React app to visualize and animate the Gitflow. Basically, in Gitflow,
- There's a
master
branch. - You create a
develop
branch off ofmaster
. Thisdevelop
branch is your bread and butter as most of your changes go in here. feature
andrelease
branches are created off ofdevelop
.- Once you are done with
feature
, you merge it todevelop
. - Once you are done with
release
, you merge it to bothdevelop
andmaster
. And you tag the release. - If there's a issue in production, you create a
hotfix
branch off ofmaster
. - Once
hotfix
is done, you merge it back tomaster
anddevelop
and tag the release.
Animate the Gitflow
Source: https://github.com/vraa/gitflowanimated
Click on the buttons below / next to each branch to simulate the action and see the commits flowing.