9 May
2013
9 May
'13
8:28 a.m.
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.
--
Michal Čihař | http://cihar.com | http://phpmyadmin.net