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 <[email protected]> > 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
