Hi, I got a question from a student I am mentoring, about using many feature branches in his tree. Here is the answer that apply (at least) to the two students I mentor.
Because the sub-projects on the schedule are linear, my opinion is that it will be simpler to just use the master branch, completing one feature before starting the next one.
Of course, the student has to frequently merge origin/master (origin being [0]) to his master branch or to all of his feature branches, to keep up with what happens in the "common" tree.
Moreover, if the student has many branches and modifies the same file in more than one branch, cross-merging between his branches has to be done and this require more planning.
There won't be a "final" merging at the end of GSoC. From the student guide [1], "Push every change you've done so that we can track your progress. GSoC has few deadlines, but we want to see and merge your code continuously! "
[0] git@github.com:phpmyadmin/phpmyadmin.git [1] http://wiki.phpmyadmin.net/pma/GSoC_2012_Student_Guide
Hi
Dne Fri, 27 Apr 2012 07:13:58 -0400 Marc Delisle marc@infomarc.info napsal(a):
I got a question from a student I am mentoring, about using many feature branches in his tree. Here is the answer that apply (at least) to the two students I mentor.
Because the sub-projects on the schedule are linear, my opinion is that it will be simpler to just use the master branch, completing one feature before starting the next one.
I expect this will be the usual case, so one branch should work quite well.
However in case you start hacking on something completely different (eg. you notice that some quite unrelated function should be rewritten or fixed), it would be better to have such changes separately to allow easier and faster merging of such fixes. Preferably such branches should branch off official repository.
On Fri, Apr 27, 2012 at 5:04 PM, Michal Čihař michal@cihar.com wrote:
Hi
Dne Fri, 27 Apr 2012 07:13:58 -0400 Marc Delisle marc@infomarc.info napsal(a):
I got a question from a student I am mentoring, about using many feature branches in his tree. Here is the answer that apply (at least) to the two students I mentor.
Because the sub-projects on the schedule are linear, my opinion is that it will be simpler to just use the master branch, completing one feature before starting the next one.
I expect this will be the usual case, so one branch should work quite well.
However in case you start hacking on something completely different (eg. you notice that some quite unrelated function should be rewritten or fixed), it would be better to have such changes separately to allow easier and faster merging of such fixes. Preferably such branches should branch off official repository.
Thanks for clearing up my doubt related to using separate branch. As my GSoC project includes refactoring, I would prefer to use the master branch only. I have updated my Git repo information on the wiki page [0]. Please update my demo server [1] to point to the new repository.
Thanks Atul
[0] https://wiki.phpmyadmin.net/pma/GSoC_2012_Projects#Refactoring:_Table_search... [1] http://demo.phpmyadmin.net/gsoc-atul/
--
Michal Čihař | http://cihar.com | http://phpmyadmin.cz
Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel
Hi
Dne Sat, 28 Apr 2012 15:49:19 +0530 Atul Pratap Singh atulpratapsingh05@gmail.com napsal(a):
Thanks for clearing up my doubt related to using separate branch. As my GSoC project includes refactoring, I would prefer to use the master branch only. I have updated my Git repo information on the wiki page [0]. Please update my demo server [1] to point to the new repository.
Done.
-
Atul Pratap Singh -
Marc Delisle -
Michal Čihař