[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Access request to push to translation
From: |
Jonas Hahnfeld |
Subject: |
Re: Access request to push to translation |
Date: |
Sun, 21 Jun 2020 13:53:01 +0200 |
User-agent: |
Evolution 3.36.3 |
Am Sonntag, den 21.06.2020, 13:20 +0200 schrieb Han-Wen Nienhuys:
> BTW, regarding translations:
>
> I notice that translation work gets merged as
>
> "commit cb1b3c1fb0c1d9dc1fb6fdadb0907c07b8a692e5
> Merge: 22eca98efe b47e5def69
> Author: Jean-Charles Malahieude <lilyfan@orange.fr>
> Date: Sat Jun 20 17:44:05 2020 +0200
>
> Merge branch 'master' into translation"
>
>
> could we flip the merge order? The history view in gitk now makes it
> look as if 'translation' is the main development branch, while
> 'master' gets merged in from the side.
+1, that's also what CG will recommend once the updated version is
online. (I did it wrong myself when doing the first merge, and figured
out later that the other order makes more sense.)
Jonas
signature.asc
Description: This is a digitally signed message part
- Access request to push to translation, Francisco Vila, 2020/06/21
- Re: Access request to push to translation, Jonas Hahnfeld, 2020/06/21
- Re: Access request to push to translation, Francisco Vila, 2020/06/21
- Re: Access request to push to translation, Han-Wen Nienhuys, 2020/06/21
- Re: Access request to push to translation, Francisco Vila, 2020/06/21
- Re: Access request to push to translation,
Jonas Hahnfeld <=
- Re: Access request to push to translation, Jean-Charles Malahieude, 2020/06/21
- Re: Access request to push to translation, Jonas Hahnfeld, 2020/06/21
- Re: Access request to push to translation, Francisco Vila, 2020/06/21
- Re: Access request to push to translation, Jonas Hahnfeld, 2020/06/21