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

[Carl Sorensen]

On 12/13/11 7:06 AM, "address@hidden" <address@hidden>
wrote:

>Second draft uploaded; more robust with rebases instead of merge.
>
>Question: the old docs want translators to avoid rebasing for some
>reason.  Is that reason still valid?  Because it would be very nice if
>we didn't have to have a separate section of "git for translators".
>http://lilypond.org/doc/v2.15/Documentation/contributor/pulling-and-rebasi
>ng

For some reason, which I don't understand, tranlsations are *always* added
to master as a merge commit.

For this reason, you don't want to do git pull -r

Perhaps Francisco or John can shed more light on this subject.

Thanks,

Carl