[Phpmyadmin-devel] Merging translations in git

Dieter Adriaenssens dieter.adriaenssens at gmail.com
Thu May 16 15:50:32 CEST 2013

2013/5/9 Michal Čihař <michal at cihar.com>:
> Hi all
> I've just updated our wiki to include more detailed guide how to deal
> with merging po files:
> https://wiki.phpmyadmin.net/pma/Git#Merging_translations
> Please use that, otherwise po files in master will get corrupted as
> seen quite often recently. It is nearly impossible to do proper merge
> with them as the branches diverge.

So, to be sure, this means that this guidelines needs to be followed
on every merge from QA_* to master?
I guess it only applies if there are changed po files, but to be sure
there, you would have to check anyway with the first part of the

Kind regards,

Dieter Adriaenssens

More information about the Developers mailing list