| Re: [translations] italian website PATCH |
[ Thread Index |
Date Index
| More lilynet.net/translations Archives
]
- To: Federico Bruni <fedelogy@xxxxxxxxx>
- Subject: Re: [translations] italian website PATCH
- From: Francisco Vila <paconet.org@xxxxxxxxx>
- Date: Fri, 18 Jun 2010 10:13:58 +0200
- 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; bh=mnA1as8cOPJDLp73Rge8JX8bJFwTa/9mAQgZK6kscCs=; b=UAyhUD1SF9HTjKI7p+OMIGumnmwFipxCCbsxqT3B+WVgMPm62I7fPNfqtTKfivuKf8 NepH4cb+HMlXlY6fthl0CmgPz52kCChlN8Bgtqz92Py9E1lRi78MUFr1YKZzMz25cpif 7S/G8mvkHkZ7+VD95BaajLslhBFtd+x2L8PlE=
- 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; b=wHB+GMXYZezrDPSUshEDN2bPLH/cNIcIQXgjLEgFmk1UWg0XYFBG0PCz63ZseQj1YL BIdZ5V3InRMhvlXHVPLPJCyvAcmed5Np3JtECwWZEB1TRmzxiL9vZQtj2uyDiMpuEEIN aQsl7Sq8mLICfXJSkAH3G6Mh+mtRUgF5eunHc=
2010/6/18 Federico Bruni <fedelogy@xxxxxxxxx>:
>> Basically, it's choosing one off both alternatives marked with
>> <<<<<<<< in your files, then committing the result.
>>
>
> The CG points to a section of the git-merge manual.
> I'm reading it but I can't understand how can I see these differences marked
> with <<<<<<<<<<<<<
> Hint?
They are in the conflicting file, search for "<<<<" and you'll
probably be directed to it. Once found, choose one block or another,
as in
Here are lines that are either unchanged from the common
ancestor, or cleanly resolved because only one side changed.
<<<<<<< yours:sample.txt
Conflict resolution is hard;
let's go shopping.
=======
Git makes conflict resolution easy.
>>>>>>> theirs:sample.txt
And here is another line that is cleanly resolved or unmodified.
[taken from git merge --help]
Remove the '<<<<<...' '=====...' and '>>>>>...' lines, and leave only
one of the in between line blocks.
--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com