Re: CG: explanation of branches for the impatient (issue 5484043)

[janek . lilypond]

A few comments, but otherwise LGTM


http://codereview.appspot.com/5484043/diff/7001/Documentation/contributor/source-code.itexi
File Documentation/contributor/source-code.itexi (right):

http://codereview.appspot.com/5484043/diff/7001/Documentation/contributor/source-code.itexi#newcode318
Documentation/contributor/source-code.itexi:318: @qq{profit}, I mean
@qq{push stuff to staging}.
i don't understand how switching branches has anything to do with
pushing to staging.

http://codereview.appspot.com/5484043/diff/7001/Documentation/contributor/source-code.itexi#newcode446
Documentation/contributor/source-code.itexi:446: git rebase dev/cg
On 2011/12/16 05:52:34, Keith wrote:
> This makes the history of commits linear, but in the wrong order. (It
puts any
> new commits from the repository /after/ the new commits from dev/cg --
and any
> conflict resolution would change the commits from the repository.)

> Git changes the branch that is checked-out, and we want to change the
sequence
> of commits developers branch, so
>   git checkout dev/cg
>   git rebase staging
>   git checkout staging
>   gitk

+1, this makes much more sense

http://codereview.appspot.com/5484043/