Merging to your development branch is fine and will help you from diverging too much. However, merging to trunk should not happen until your mentor has given the approval and this generally waits to happen until after GSoC has finished.

Thank you for the updates on this btw, we all really appreciate it!

Cheers,
Josh