[Phpmyadmin-devel] please do not commit to MAINT_3_4_0, QA_3_4 or master

[Michal Čihař]

Hi

Dne Tue, 10 May 2011 22:31:21 -0400
Marc Delisle <marc at infomarc.info> napsal(a):

> please wait before committing anything to these branches, a problem
> occurred and has to be fixed before.

The repository is now fixed and open to commits. I've decided to revert
wrongly merged commits by git reset. This means that history has been
changed in MAINT_3_4_0 and QA_3_4 branches. If you have any pending
commits for these branches, please rebase them on new ones.

Next time please remember not to merge master into maintenance
branches, as documented on the wiki:

http://wiki.phpmyadmin.net/pma/Git#Committing_fixes_to_several_branches 

-- 
	Michal Čihař | http://cihar.com | http://phpmyadmin.cz
-------------- 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/20110511/7c812e10/attachment.sig>