[MacPorts] SummerOfCodeGuidelines modified

[MacPorts]

Page "SummerOfCodeGuidelines" was changed by cal at macports.org
Diff URL: <https://trac.macports.org/wiki/SummerOfCodeGuidelines?action=diff&version=3>
Revision 3
Comment: document merge requirement.
Changes:
-------8<------8<------8<------8<------8<------8<------8<------8<--------
Index: SummerOfCodeGuidelines
=========================================================================
--- SummerOfCodeGuidelines (version: 2)
+++ SummerOfCodeGuidelines (version: 3)
@@ -32,3 +32,7 @@
   * Speak to your mentor, that's what he is for. 
   * Find the best medium to communicate with your mentor (Email, IM, IRC, VoIP, Telephone call?) and schedule together how often you will communicate (daily? weekly? every Monday/Wednesday/Friday?)
   * If you lost the communication channel to your mentor, immediately speak to other mentors and tell us about that. Unplanned gaps in communication should not happen and will probably hit your progress.
+
+== Merging the Code ==
+
+By the end of the summer your code should be ready to be merged back into the main development branch. Plan accordingly and prepare some time for the actual merge and a few hours of work through the next week(s) when bug reports from other developers testing your code come in on the mailing lists. We've made this a requirement in 2013 to avoid the code laying around unused on a branch after GSoC where nobody can benefit from it and have had good experience with it so far.
-------8<------8<------8<------8<------8<------8<------8<------8<--------

--
Page URL: <https://trac.macports.org/wiki/SummerOfCodeGuidelines>
MacPorts <http://www.macports.org/>
Ports system for OS X

This is an automated message. Someone added your email address to be
notified of changes on 'SummerOfCodeGuidelines' page.
If it was not you, please report to .