From: Jiang Xin <worldhello.net@gmail.com>
Date: Thu, 20 Jul 2017 00:50:09 GMT
Subject: Re: [L10N] Kickoff of translation for Git 2.14.0 round 1
Message-ID: <CANYiYbESKtiAounR3hT-n542qoFcUx90DnMGNk0JGiEq9s47Nw@mail.gmail.com>
In-Reply-To: <9f2b1205-01fa-ef7b-81ec-7717103936c7@softcatala.org>

2017-07-19 13:44 GMT+08:00 Jordi Mas <jmas@softcatala.org>:
> El 15/07/2017 a les 07:06, Jiang Xin ha escrit:
>>
>
> Hello Jiang,
>
> Sometimes I do several commits to complete the translation. However, github
> from the UI does not offer me the option to Merge and Squash.
>
> Can you check that you have "Allow squash merging" activated for the
> https://github.com/git-l10n/git-po repository?

Yes, it was activated. But I doubt the commit log of the squash merge
won't follow our standard.

For me, I prefer doing an interactive rebase and squashing all the
commits into one, and will record the contributors in header of the
file and in the commit log message.

>
> Allowing this from the Github UI will make life more easy.
>
> Thanks,
>
> Jordi,
> --
> Jordi Mas i Hernàndez -Bloc: http://gent.softcatala.org/jmas/bloc/
> Planet Softcatalà -> http://planeta.softcatala.org
>
> ---
> This email has been checked for viruses by AVG.
> http://www.avg.com
>



-- 
Jiang Xin