| Re: [translations] italian website PATCH |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: Translations list at lilynet <translations@xxxxxxxxxxx>
- Subject: Re: [translations] italian website PATCH
- From: Francisco Vila <paconet.org@xxxxxxxxx>
- Date: Fri, 18 Jun 2010 09:09:42 +0200
- 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:content-type; bh=QAOd1aNmDBpblZ2m3g1bsnojO3g6dOwDaidMOYSFLxw=; b=hi9qDOLSAjved+E5IxZMnFDo8SqhwV8yaMo9j8kEoiXyU6ajsepgUUVXWy9q6BgwDp JQtUfdQ6IvB2FLUyz5tyEx3Cprx0xWLYVG5+jlAx2E5vTgQ6gueYR39fnmUg9NQOvwWt QMpC1z2Ln4DBYfT55GgJoaKxV/2HramAcxQPw=
- 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 :content-type; b=T5IgAiEe2QhvA2/l8uZBWej6P0cL9UKAE/tIbA7SUC7mR79ZEe16oFbEJnLpHDHq4D Gc4OYoXyqUSrr5UXXz5Z/Ve3ot6ZTVHtRh9crz4iAmoYYGrIygsj4y9gp4DJ8jPHdvJK XBlmZWzBlEN4TKfce3DvrjDlI2vt1C/94Y9G0=
2010/6/18 Federico Bruni <fedelogy@xxxxxxxxx>:
> I've commited the changes made two days ago (which hopefully will fix the
> warnings of 'make website').
> Then I run git pull -r
>
> But I have conflicts (see below).
You'll have to resolve them. Need advice on this? If it's not in the
CG, we can talk about it here.
Basically, it's choosing one off both alternatives marked with
<<<<<<<< in your files, then committing the result.
> Also, how can I add the last few changes to the existing patch?
You don't modify existing patches; rather you create new ones.
git format-patch <from>..<until>
--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com