Le 2013-12-03 01:46, Hugues Peccatte a écrit :
Hi Marc,
Thanks, this is the page I was looking for. So I'll merge it as soon as possible.
Hugues, warning: do not merge master to another branch like QA_4_1, it would damage this other branch.
In the case of this fix, since it created another message, it's better to leave it only in master. That's why I did not object to your pull request targetting master.
For a "normal" fix not involving a new message, we target a QA branch when doing the pull request on github.
Thanks, Hugues.
2013/12/2 Marc Delisle <marc@infomarc.info mailto:marc@infomarc.info>
Hugues Peccatte a écrit : > Hi everyone, > > I just did my first merge of pull request linked to a bug ticket: > https://sourceforge.net/p/phpmyadmin/bugs/4157/ > My pull request had been merged into the master. > > Should I merge it in any other branch ? QA_4_1 ? STABLE ? None ? > And then, how should I close the ticket please ? I saw that you change the > priority to 1, set the status to "resolved" and add a prefix in the > subject: "(ok X.X.X-YY)". Hi Hugues, see http://wiki.phpmyadmin.net/pma/Release_Targets Normally, we should be fixing bugs in QA_4_0 (unless the bug is not present in 4.0.x). We do not close a ticket until the corresponding version is released. This is to avoid duplicate reports. > > Shouldn't I also update the Changelog file ? > > Thanks, > Hugues. > > > > ------------------------------------------------------------------------ > > ------------------------------------------------------------------------------ > Rapidly troubleshoot problems before they affect your business. Most IT > organizations don't have a clear picture of how application performance > affects their revenue. With AppDynamics, you get 100% visibility into your > Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! > http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk > > > ------------------------------------------------------------------------ > > _______________________________________________ > Phpmyadmin-devel mailing list > Phpmyadmin-devel@lists.sourceforge.net <mailto:Phpmyadmin-devel@lists.sourceforge.net> > https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel -- Marc Delisle http://infomarc.info | http://phpmyadmin.net ------------------------------------------------------------------------------ Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk _______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net <mailto:Phpmyadmin-devel@lists.sourceforge.net> https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel
Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clk...
Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel