Gitflow with a picture :)

git-flow

Git flow is really simple but you must be very strict when using it.. as in you either do gitflow or not at all.

1 – Master is basically what the live website follow.

2 – Develop is where work gets merged into.

3 – Features is where the new work is built

4 – Hotfixes are for when you urgently need to work going live and cannot wait for the develop branch to be ready for release.

 

The one branch that is not mentioned in the picture is the release branch… I will add this later.