| Re: [translations] Doc-it update patch |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: Federico Bruni <fedelogy@xxxxxxxxx>
- Subject: Re: [translations] Doc-it update patch
- From: Francisco Vila <paconet.org@xxxxxxxxx>
- Date: Sat, 4 Dec 2010 11:27:09 +0100
- Cc: Translations list at lilynet <translations@xxxxxxxxxxx>
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=zOhJQidHN7kSlxwmX4VgbFgbICnjduv3POoF7GSEOW8=; b=ICXjznAmVdOEmkuY6oNQqyLx87gWVrZh2SBU7V3V42QzfHPEJyHb2i/bGEyZgLO4ta hYCGfBqWsy/vu/7iFhi25uGML8T/3LISPtpG0tI/0aCsS2vgOk6hCFmG3KPZF5/z3K4O 9ciWryl9StuRDuImqi/YXoq83/tDFpcdHbraQ=
- Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=DiVD5pxJ4s4ZK3dLAmkN8fD8kaqjBDPeG6moBThXkmeqbaZihEizqREeoajWWrLX1F l7lEt81/VBvvfsLhTEyINsyDpItiNyLEuAmTb9ia25W/NgCEsjorRJvlY+d8Bj4ayJXQ FtccyOOlXMM7JgM08l8dmCf0yPMyYeQcZPh0o=
2010/12/4 Federico Bruni <fedelogy@xxxxxxxxx>:
> There is no conflict but, after pulling, my branch is ahead by 2 commit.
>
> git log -p
>
> commit 2e2166004fdd1cbfd3cda09ec697bbe84d73a001
> Merge: 6f6134b 27945b3
> Author: Federico Bruni <fedelogy@xxxxxxxxx>
> Date: Sat Dec 4 10:24:18 2010 +0100
>
> Merge branch 'lilypond/translation' of git://git.sv.gnu.org/lilypond
> into li
>
> commit 27945b310409e8e0e76ceffc5aa34851448239b8
> Author: Federico Bruni <fedelogy@xxxxxxxxx>
> Date: Sat Nov 27 17:22:41 2010 +0100
>
> Doc-it: update italian translation
>
>
> So the last commit is the merge.
Yes, this is because I had to resolve two conflicts. Patch did not
apply cleanly at first, but I did git am -3
> I'm sure there's no difference between my copy and origin.
There were a coule of differences, certainly.
> So I could safely do:
> git reset --hard origin/lilypond/translation
>
> right?
No need, but it is harmless if you don't have anything valuable and
not commited.
>
> But I wonder: why git pull didn't "work"?
Because of the conflicts.
> I should have pushed before pulling?
No, you sent me the patch, you should rely on remote tree since then
> I guess that always using git reset --hard is not a "best practice".
--hard could be too 'hard' but pull right after one and nothing bad will happen.
Summarizing. If you have nothing valuable, reset hard to cc6f143d298
then pull. That commit is previous to your patch, I think. If not,
reset to a even earlier version.
--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com