Skip to content

Instantly share code, notes, and snippets.

View ex-nerd's full-sized avatar

Chris Petersen ex-nerd

View GitHub Profile
@ex-nerd
ex-nerd / tutorial1.rst
Created March 11, 2012 10:01
Yet Another (corporate) Git Workflow Recommendation

Yet Another (corporate) Git Workflow Recommendation

I noticed myself passing around similar copies of the same git description to friends and coworkers enough times that I finally decided to write it up for a wider audience, though mostly so I would only have to do it one last time.

First off, this recommendation is for novice git users, particularly those who are coming from a CVS or Subversion background.

This workflow is based on the `Branching workflow`_ described in the `Pro Git`_ book (which I recommend that you find some time to read). In my experience, I've found that the distributed model just doesn't make sense in a corporate environment where people want there to be a single canonical origin repository.

*This is a work in progress. It's currently divided up into two sections, one describing what I hope is an easy walkthrough of recommended workflows, the other delving into much more detail about how git allows you to some of the more interes