Hi, please wait before committing anything to these branches, a problem occurred and has to be fixed before.
Hi
Dne Tue, 10 May 2011 22:31:21 -0400 Marc Delisle marc@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
Hi
Dne Wed, 11 May 2011 07:19:22 +0200 Michal Čihař michal@cihar.com napsal(a):
Hi
Dne Tue, 10 May 2011 22:31:21 -0400 Marc Delisle marc@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.
Also if you have checked out MAINT_3_4_0 or QA_3_4 branches while they were merged with master, you will have to reset them to current state:
git reset --hard origin/MAINT_3_4_0
or
git reset --hard origin/QA_3_4
-
Marc Delisle -
Michal Čihař