Git workflows

Back to Git and Wiki

Table of Contents Recommendation from Scott Chacon Recommendation from Github Links about flows Git fetch and merge versus pull

Recommendation from Scott Chacon

For teams that have to do formal releases on a longer term interval (a few weeks to a few months between releases), and be able to do hot-fixes and maintenance branches and other things that arise from shipping so infrequently, git-flow makes sense and I would highly advocate it’s use.

For teams that have set up a culture of shipping, who push to production every day, who are constantly testing and deploying, I would advocate picking something simpler like GitHub Flow.

Recommendation from Github

Recommendation of workflow from github

Links about flows

GitHub Flow

git-flow

more git-flow

git-flow with SourceTree

stuff about no ff

Another flow

More about workflows

Workflow chapter from Pro Git book

Git fetch and merge versus pull

http://longair.net/blog/2009/04/16/git-fetch-and-merge/

http://stackoverflow.com/questions/292357/whats-the-difference-between-git-pull-and-git-fetch