| Re: [translations] troubles with Git: pull and push |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: David Kastrup <dak@xxxxxxx>
- Subject: Re: [translations] troubles with Git: pull and push
- From: Federico Bruni <fedelogy@xxxxxxxxx>
- Date: Fri, 14 Dec 2012 01:25:15 +0100
- Cc: LilyPond Translation <translations@xxxxxxxxxxx>
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=9MZVVizDQp/ntAFgbRKssDMYTvLFBOKgB7GPGZWnnLk=; b=M17L75GOjwsVeXDjqSekGDAhVOxa9n5hH9XgRpl3OofF9/2YJY6o8TC8j7mwjoTbdp uuaWFldKJyN/YHaaAd7tPYUcdkvuuzuvttDkmLy18+J2MINNmuLa8yzqgAO18896Z3hv PVCGhmgR0baUWj9+sae10Pu0jOtGr7cNwyj/YTXDnPVUIQZtcoN1c7QaRMec4jMlgvMO bg64997eQVLPUncFEKxsNvqC2aGIp/sNnhAmlUpVuqw0W7Sed4yNMUWiypH9xvRXNsvt 5NHI5bcr5qHT9NovhmHm1mErDTp1/xCu/SB7FjlMV+0xksOfAag1DtdzKoKzVHJHrjLU 9UJw==
Il 13/12/2012 21:34, David Kastrup ha scritto:
IIRC, rebasing is not recommended for translators.
Rebasing your local work on top of the remote translation is fine and
actually correct. You just should not rebase master on translation or
vice versa.
git pull -r
worked fine
I read in the manual that git-rebase, if nothing is specified, will
rebase the current branch on top of the upstream configured in the
remote and merge options for that branch, that is:
[branch "translation"]
remote = origin
merge = refs/heads/translation
From now on I'll use 'git pull -r' before pushing.
I'm not sure why rebasing is not recommended for translators:
http://lilypond.org/doc/v2.17/Documentation/contributor/pulling-and-rebasing
Maybe it's about using new committishes not yet pushed to the repository
(as explained in the note -- see above link). This is never the case for me.