What are the popular Git layout strategies?

Question

The developer recently showed me a blog post with a good visual representation of the git layout. He implied that this particular strategy was gaining in popularity, but numerous searches here and through Google had not yet appeared on the blog.

The bottom line is that you had a trunk for the main development and a “side trunk” for fixing errors caused by the client. The main development had a branch, which was periodically included in the trunk for major releases, and then you had function branches. There was a beautiful diagram that clearly showed all this.

Since I would like to know git better, I would like this diagram to be available as an assistant. It would also be useful as a visual in order to convince colleagues to switch to git. Does anyone know what I'm talking about and can provide a link?

EDIT: Now I understand that my title is a bit misleading. If someone wants to post additional strategies for git branching, they will also be appreciated.

Answer 1

It looks like you are talking this workflow called "Successful git branching model . " People at nvie also created the git -flow subcommand, which implements the branching model described in the first link. The blog post about the git-flow tool can be found here . However, note that git -flow may be a bit more complicated to configure on Windows. On * IX machines, it is very simple.