<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Mon, May 5, 2014 at 10:46 PM, Michal Čihař <span dir="ltr"><<a href="mailto:michal@cihar.com" target="_blank">michal@cihar.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Hi<br>
<br>
Dne Mon, 5 May 2014 22:41:04 +0530<br>
Dhananjay Nakrani <<a href="mailto:dhananjaynakrani@gmail.com">dhananjaynakrani@gmail.com</a>> napsal(a):<br>
<div class=""><br>
> I am about to start the development on my GSoC project. I have some doubts<br>
> about the workflow that I should resolve before starting the development.<br>
> This is the workflow of GSoC project as I per my understanding.<br>
><br>
> Commit everything in a separate branch of own repositories and at the end<br>
> create a pull request for all the commits of the project.<br>
<br>
</div>It is better to make separate pull requests for every feature or simply<br>
whenever it makes sense. The pull request is usually the place to<br>
review your code, so doing this more frequent helps both mentor (to not<br>
have huge pieces of code to review) and student (to avoid possibility<br>
of needing to rewrite huge blocks of code if they don't pass the<br>
review).<br>
<div class=""><br>
> Now, which branch should I use as the base branch while creating a separate<br>
> one for my project development? Should I use 'master' or 'QA_4_2'?<br>
<br>
</div>Generally any new features are developed on master branch, see also<br>
<a href="https://wiki.phpmyadmin.net/pma/Developer_guidelines#Branches_in_Git" target="_blank">https://wiki.phpmyadmin.net/pma/Developer_guidelines#Branches_in_Git</a><br>
<span class=""><font color="#888888"><br>
--<br>
Michal Čihař | <a href="http://cihar.com" target="_blank">http://cihar.com</a> | <a href="http://phpmyadmin.net" target="_blank">http://phpmyadmin.net</a><br>
</font></span><br>------------------------------------------------------------------------------<br>
Is your legacy SCM system holding you back? Join Perforce May 7 to find out:<br>
• 3 signs your SCM is hindering your productivity<br>
• Requirements for releasing software faster<br>
• Expert tips and advice for migrating your SCM now<br>
<a href="http://p.sf.net/sfu/perforce" target="_blank">http://p.sf.net/sfu/perforce</a><br>_______________________________________________<br>
Phpmyadmin-devel mailing list<br>
<a href="mailto:Phpmyadmin-devel@lists.sourceforge.net">Phpmyadmin-devel@lists.sourceforge.net</a><br>
<a href="https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel" target="_blank">https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel</a><br>
<br></blockquote></div><div class="gmail_extra"><br></div>Okay, then I will use master as the base branch. </div><div class="gmail_extra">Creating pulls for each feature makes more sense, so I'll follow that style of workflow. </div>
<div class="gmail_extra"><br></div><div class="gmail_extra"><br></div><div class="gmail_extra">Thanks again.</div><div class="gmail_extra">Dhananjay Nakrani.</div><div class="gmail_extra"><br></div></div>