[Phpmyadmin-devel] about QA_3_5 and master

Marc Delisle marc at infomarc.info
Sat Jan 28 10:24:13 CET 2012

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.

Marc Delisle

More information about the Developers mailing list