16 May
2013
16 May
'13
3:50 p.m.
2013/5/9 Michal Čihař michal@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 guidelines?
-- Kind regards,
Dieter Adriaenssens