← Back to team overview

opencog-dev team mailing list archive

merging work into opencog/main

 

Hi All,

After a chat with QuantumG, I propose this process for handling upcoming
merges & future work:

   - make a temporary 'stable' snapshot branch of main
   - merge major work branches into main (at least thee of these: Gama's
   work, Joel's work, Erickson's work)
   - together, hammer on main until everyone is happy with it again
   - close all private branches and the temporary 'stable' snapshot
   - everyone work directly from main, with everyone following the same
   practices
   - exceptions (i.e. new branches) should be discussed here or #opencog
   - EVERY new branch should be preceded by a wiki page that describes its
   location, purpose and plan for merging back into main

We should meet briefly once per week on IRC just for status, notice of
upcoming merges, gripes, etc. I suggest the 15 minutes before Ben's OCP
tutorial each Wednesday tutorial at #opencog-dev (can be created ad-hoc).

Thoughts?

-dave

Follow ups