From: Peter Gordon <peter@pg-consultants.com>
Date: Mon, 10 Mar 2008 12:37:43 GMT
Subject: Git workflow
Message-ID: <1205152663.3470.12.camel@tigger>

Hi.

There are a number of us working on a project. We each have a HEAD, and
work on branches, using git-checkout -b MyPatch. When we have finished
working on the branch, we move back to the HEAD, with 
git-checkout master, do a 
git-pull
and then git-cherry-pick sha1.....

I have two questions. 

1) Is this the normal way to work with git.

2) Also, we sometimes get a log of 
Merge branch 'master' of git://sgit/MyProject which has no commits. Why
does this happen?

Thanks,

Peter