[Phpmyadmin-devel] about QA_3_5 and master
Hi, 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 http://infomarc.info
Le 2012-01-28 04:24, Marc Delisle a écrit :
Hi, 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.
Ok, we should be fine now. -- Marc Delisle http://infomarc.info
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
Michal Čihař a écrit :
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, I don't see such mess in my QA_3_5 after updating it. -- Marc Delisle http://infomarc.info
Hi Dne Tue, 31 Jan 2012 11:31:14 -0500 Marc Delisle <marc@infomarc.info> napsal(a):
Michal Čihař a écrit :
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, I don't see such mess in my QA_3_5 after updating it.
Well I think it was cause of problems in your original mail :-) -- Michal Čihař | http://cihar.com | http://blog.cihar.com
participants (2)
-
Marc Delisle -
Michal Čihař