[Phpmyadmin-devel] about QA_3_5 and master
michal at cihar.com
Wed Feb 1 09:07:14 CET 2012
Dne Tue, 31 Jan 2012 11:31:14 -0500
Marc Delisle <marc at infomarc.info> napsal(a):
> Michal Čihař a écrit :
> > Hi
> > Dne Sat, 28 Jan 2012 04:24:13 -0500
> > Marc Delisle <marc at infomarc.info> napsal(a):
> >> I'm not sure what is happening between these branches but please wait
> >> before merging QA_3_5 into master until the situation is fixed.
> >> The usual recipe of
> >> git merge -X ours QA_3_5
> >> does not seem to work.
> > Sorry it looks like I've messed up setup on translation server a bit,
> > what lead to merging master back to QA_3_5.
> I don't see such mess in my QA_3_5 after updating it.
Well I think it was cause of problems in your original mail :-)
Michal Čihař | http://cihar.com | http://blog.cihar.com
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 836 bytes
Desc: not available
More information about the Developers