[Phpmyadmin-devel] Merging translations in git

[Michal Čihař]

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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.phpmyadmin.net/pipermail/developers/attachments/20130509/996fb4f4/attachment.sig>