Re: [Phpmyadmin-devel] about QA_3_5 and master

Hi Dne Sat, 28 Jan 2012 04:24:13 -0500 Marc Delisle <marc@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. -- Michal Čihař | http://cihar.com | http://phpmyadmin.cz