The prototypical Gitflow diagram is a bit dated. Here's an updated Gitflow workflow diagram that includes merges, branches and even some color.