| Re: [translations] Doc-it update patch |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: Francisco Vila <paconet.org@xxxxxxxxx>
- Subject: Re: [translations] Doc-it update patch
- From: Federico Bruni <fedelogy@xxxxxxxxx>
- Date: Sun, 05 Dec 2010 12:21:26 +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:received:received:subject:from:to:cc :in-reply-to:references:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=DPf7c/c5ebBr34CXToBTwZ999j97Ob9UQUX90Ss5CA0=; b=mA2vUPboZyb0ZZ1CH2BwPhetBtH7mkO2bV/MmLNCZjagrOnmjulAUw/YNhjFlwVtnL ROZ/Zc2AEde9xLi2756nHQD33j7+QjrhFzB84JEFTFn0hj89amvE1BkZfWm7q7l4r9oN 7L+a36k9fW16o+TBonQafMo6ryUZhGU2ngBoI=
- Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=SCKu8dGfFKdKcwxiNnmjRaymHCx4sZ4lZNw1UJBl2DpSxp5rtnyJlXwLIuEnxqWTae eRsqrnqEe1di/bebaU3hCEO6o6scs2RhKEhWGeqphq3j/vLFuSnbJ6VtayT00oyHBuhh a6KCgKVrnL99VZI5JflxJs7urssPPimRRn7Hw=
Il giorno sab, 04/12/2010 alle 11.27 +0100, Francisco Vila ha scritto:
> 2010/12/4 Federico Bruni <fedelogy@xxxxxxxxx>:
> > 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
>
ok
> > I'm sure there's no difference between my copy and origin.
>
> There were a coule of differences, certainly.
>
why Git didn't tell me anything about it? (see terminal output in my
previous email)
> 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.
>
it worked, thanks