[Phpmyadmin-devel] Merging translations in git

[Michal Čihař]

Hi

Dne Thu, 16 May 2013 15:50:32 +0200
Dieter Adriaenssens <dieter.adriaenssens at gmail.com> napsal(a):

> 2013/5/9 Michal Čihař <michal at 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?

Yes, to be safe, always check :-).

-- 
	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/20130517/aff3a4a7/attachment.sig>