lilypond-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: graham
Subject: Re: CG: explanation of branches for the impatient (issue 5484043)
Date: Tue, 13 Dec 2011 14:03:03 +0000

thanks, Keith!  I've made all the changes other than the two noted
below.


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

http://codereview.appspot.com/5484043/diff/1/Documentation/contributor/source-code.itexi#newcode344
Documentation/contributor/source-code.itexi:344: @example
On 2011/12/13 07:47:18, Keith wrote:
On branch dev/cg, simply
   git pull -r

that gives me a complaint that I haven't told it which branch to rebase
against.  I know I could set up something fancy in .git/config to
auto-rebase against origin/master or something like that, but I'd rather
keep the instructions usable against a plain git clone
git://...lilypond.git

Revised instructions going up in a few minutes, which I think resolves
this.

http://codereview.appspot.com/5484043/diff/1/Documentation/contributor/source-code.itexi#newcode354
Documentation/contributor/source-code.itexi:354: @subsubheading Save
commits manually (optional)
On 2011/12/13 07:47:18, Keith wrote:
"Using patch files (the other option)"

I'd rather not offer that option -- given another 1 or 2 drafts, I think
we can have the branch-based solution being simple enough that there's
no need for patch files.

I totally want to keep this section in terms of "making a backup" for
people (like me) who aren't familiar enough with git to trust it.  But
I'd rather frame it as *only* a backup method.

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]