11 May
2011
11 May
'11
5:31 a.m.
Hi,
please wait before committing anything to these branches, a problem
occurred and has to be fixed before.
--
Marc Delisle
http://infomarc.info
11 May
11 May
8:19 a.m.
New subject: [Phpmyadmin-devel] please do not commit to MAINT_3_4_0, QA_3_4 or master
Hi
Dne Tue, 10 May 2011 22:31:21 -0400
Marc Delisle <marc(a)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
8:23 a.m.
New subject: [Phpmyadmin-devel] please do not commit to MAINT_3_4_0, QA_3_4 or master
Hi
Dne Wed, 11 May 2011 07:19:22 +0200
Michal Čihař <michal(a)cihar.com> napsal(a):
Hi
Dne Tue, 10 May 2011 22:31:21 -0400
Marc Delisle <marc(a)infomarc.info> napsal(a):
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
--
Michal Čihař | http://cihar.com | http://phpmyadmin.cz
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.
4880
days inactive
4880
days old
2 comments
2 participants
participants (2)
-
Marc Delisle -
Michal Čihař