[Phpmyadmin-devel] Quick GSoC related GIT question

[Rouslan Placella]

Hi all,

I wonder what way are the GSoC students expected to maintain their GIT
repository during the summer. I guess that there are at least two ways
to go about it:

#1: Create a branch and commit to it all summer without pulling from
master. Then either the student or some other dev will have to merge it
with master (which is probably a lot of work).

#2: Create a branch and commit to it all summer, but also constantly
pull and merge with other changes from master. At the end of the summer
it will be the trivial to merge that branch into master (but there is
more responsibility for the student - making sure not to screw up the
merges as (s)he goes along).

I know for a fact that some orgs prefer the students to use method #1,
but I can certainly see the advantages of method #2.

Thank you for your feedback.

Rouslan