Re: [translations] How to use git

[Francisco Vila <paconet.org@xxxxxxxxx>]

2010/11/10 Till Paala <till.rettig@xxxxxx>:
> Am 07.11.10 19:07, schrieb Francisco Vila:
>>
>> 2010/11/6 Till Paala<till.rettig@xxxxxx>:
>>>
>>> Hi translators,
>>>
>>> I just got annoyed by this superflous merge commit with the message
>>> "Merge branch 'lilypond/translation' of
>>> ssh://git.sv.gnu.org/srv/git/lilypond into lilypond/translation"
>>> that git does me almost all the time.
>>
>> What exactly is "almost all the time"?  Once for every commit you try to
>> make?
>>
>>> How to pull correctly so this wouldn't
>>> occur anymore?
>>
>> If you want, we could compare our configs, I don't have that message.
>
> never mind, Valentin explained it. I meant the message from a commit that
> merges my tree when I have done updates and pulled on top of them.

Right, then.  This is what I do to avoid any unwanted merge: try
pushing as soon as possible after a pull.  Do not pull a day, make
changes for some days, then push. You can understand that many things
could happen in the meantime on origin.

If the pull can't fast-forward my tree, and for any reason I can not /
do not know how to push a clean commit, a last resort trick is git
format-patch <my first commit>.  Then reset to a version which you are
sure it is on origin.  A quick look at

  http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=shortlog;h=refs/heads/lilypond/translation

usually helps.  Do 'git log' frequently and compare your output with
the one from that page.

Once you are sure that your history matches that of origin, apply with
'git am' the patches you made before, then push.

I know these are somewhat personal tips and tricks, not optimal or
professional enough, but they work.  I am open (and thankful) to
suggestion for improvements to this.

-- 
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com