| 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: Sun, 5 Dec 2010 13:11:49 +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=T+iV3AUAVnpRaZuE1no5DJbgd3x/gg8+XTM+8cmTvTg=; b=hXSsneJRdLPeHI4aB8U8Yb0XQDWZSj4BRTZfVB49FoY4O2DfToZdhDJHV8drHdNmgS bVLzM6q9l9ioKf8uEKT87tnVLzWNKjupuJ/Ab9JWDVtrU1yhEmXk2pwgJvLbd8bPB3oO Yc8s6bplYWzqzhPpSzIltk2BDeaAZ/pkzZvk4=
- 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=j8ebw44tOYXiUjg/z7Xfca2DNCFDfQhbaj/qmSkTxr7VjPOOL3z9HvQW1/YShNQLN/ hFw5n6/3PPlVyJ2VwRWScHLBuimV7yy/OY/cR6PDLyBubsGcORAbdR1yuriBGSRNgvl1 0lQa+jGxV8rGhBX4DWjtWsBDhMQD5WB05hEuY=
2010/12/5 Federico Bruni <fedelogy@xxxxxxxxx>:
> 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)
Git told you that all was OK because I pushed a commit with conflicts
already resolved. The problem originated when you posted a patch
which I initially didn't know which version did it apply against. git
am -3 figures it out and does the trick. Problem solved in my side,
no problem on git after I did push that commit, no problem in your
side when you pull.
--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com