Re: Doc: CG: add instructions for staging branch (issue 5440080)

[Graham Percival]

On Sat, Dec 03, 2011 at 10:51:49AM -0000, Phil Holmes wrote:
> My (simple) workflow is that I use lily-git to
> pull, make my changes, use lily-git to commit and create a patch,
> then I usually abort my changes.  I then use command line to fetch
> staging, apply my patch and push to staging, using David's
> instructions on how to do this.  We might consider that kind of work
> flow in the CG, for people like me who aren't experienced with git.

I like it!  and that's basically what I do, anyway, although I use
git command-line to create my patch.  I'm never certain what's in
git in which branch, so I like seeing an actual .patch file
(created from git format-patch).  I think it's easier to explain
this way of working rather than the fully branch-based approach,
since it leaves those explicit patch files floating around.

How about I explain that method in detail in the CG, prepended by
the warning "if you know git, all you need to know is that you
should push to staging" ?  We'll keep the links to git tutorials
in case anybody who doesn't know git still wants to learn the
"proper" way of working with git.

Cheers,
- Graham