<div dir="ltr">Hi Fon Noel and others,<br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Mar 13, 2017 at 4:35 PM, Fon Noel <span dir="ltr"><<a href="mailto:fenn25.fn@gmail.com" target="_blank">fenn25.fn@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="auto">Hello everyone I was wondering if someone can help me explain the use of all the branches on <a href="https://github.com/phpmyadmin/phpmyadin" target="_blank">https://github.com/phpmyadmin/<wbr>phpmyadin</a> there are 7 of them if I am not mistaken including master, STABLE and the rest. How do I leverage all these branches in order to improve my contribution to PMA. So far I have been working only with the master branch. I read the documentation on <a href="http://docs.phpmyadmin.net" target="_blank">docs.phpmyadmin.net</a> even so the developer information there is limited. Maybe I will be able to update that in future. Cheers PMA team! </div></blockquote><div><br></div><div>Indeed there are several branches and it can get confusing.<br><br></div><div>* master is where main development occurs and is the next "y" release of x.y.z (so master is currently working towards the release of 4.8, which is a bit confusing because 4.7.0 isn't really out yet, but is feature frozen which is when the change actually occurs). New features, language/string changes, and major changes to fragile code go in to master.<br></div><div>* the QA branch (currently QA_4_7) is for bugfixes. This turns in to a "z" release of x.y.z (so current QA_4_7 is working towards 4.7.0, and after 4.7.0 is released it will be for bug fixes towards 4.7.1). Rarely do we make any string/language changes to a QA branch (except specifically when there's a typo only for one particular language).<br></div><div>* STABLE is automatically updated when a new release is merged. There isn't any reason to develop anything directly in STABLE.<br></div><div>* MAINT branches are for backporting security fixes to old versions that are still receiving security support. You probably will never need to develop in any MAINT branch, either.<br><br></div><div>This is meant be conveyed through <a href="https://github.com/phpmyadmin/phpmyadmin/wiki/Release_targets">https://github.com/phpmyadmin/phpmyadmin/wiki/Release_targets</a> but it may benefit from clearer writing and from being linked to from more locations.<br></div><div><br></div><div>Hope that helps.<br></div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="auto"><span class="gmail-HOEnZb"><font color="#888888"><div dir="auto">Fon Noel. </div><div dir="auto"><br></div></font></span></div>
<br>______________________________<wbr>_________________<br>
Developers mailing list<br>
<a href="mailto:Developers@phpmyadmin.net">Developers@phpmyadmin.net</a><br>
<a href="https://lists.phpmyadmin.net/mailman/listinfo/developers" rel="noreferrer" target="_blank">https://lists.phpmyadmin.net/<wbr>mailman/listinfo/developers</a><br>
<br></blockquote></div><br></div></div>