[Phpmyadmin-devel] GSoC: github tree

[Alex Marin]

Hello,

I have a question regarding [1]. In our tree, should we only add
our own commits regarding the GSoC project we are assigned?
The problem I see here is that there are chances that the files
we modify in our tree will also be modified in PMA/master,
so merge conflicts will appear that will have to be solved at
the final merge at the end of GSoC. And also, the local tree
will be a little out of date.

The alternative would be to merge [2] continuously to our tree
and mix our commits with the ones from the PMA master branch,
but then again if someone modifies a file you committed changes
to, you have to locally solve conflicts or rebase your commit.
Will the final merge be safe in this case?

Or is there no such thing as a final merge, and our good commits
will be merged to PMA/master periodically? I can imagine that
would be more difficult in some cases where some functionalities
can't be partially merged if they are more complex.

[1] http://wiki.phpmyadmin.net/pma/GSoC_2012_Student_Guide#Publish_a_Git_repository
[2] https://github.com/phpmyadmin/phpmyadmin/commits/master

Thanks,
Alex