[Phpmyadmin-devel] Merging translations in git

Marc Delisle marc at infomarc.info
Thu May 9 08:35:42 CEST 2013

Le 2013-05-09 02:28, Michal Čihař a écrit :
> 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.

Thanks, I'll try that next time :)

But I'm wondering: could we permit changes just in master?

Marc Delisle

More information about the Developers mailing list