[Phpmyadmin-devel] Merging translations in git

Mohamed Ashraf mohamed.ashraf.213 at gmail.com
Sun May 19 14:25:03 CEST 2013

On Thu, May 9, 2013 at 8:28 AM, Michal Čihař <michal at cihar.com> wrote:
> 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.
from what I understand you are just discarding any changes to the po
files in the qa branches right?

More information about the Developers mailing list