8 | | '''Outcomes:''' (1) Thomas Launois and Kun Tan will do a mini-merge (marked 1 on the figure) between VB latest FM version, their latest isotope version and Orchidee 1_8_1, (2) Martial Mancip, Thomas Launois and Kun Tan will do a mega-merge (marked 2 on the figure) between the Mini-merge and orchidee_1_9_5, (3) This version will be submitted to svn, from which the FORESTRY groups starts using the svn system + tickets and (4) All will use their own personal version, regular meetings should guarantee a slim branch. |
| 8 | '''Outcomes:''' (1) Thomas Launois and Kun Tan will do a mini-merge (marked 1 on the figure) between VB latest FM version, their latest isotope version and Orchidee 1_8_1, (2) Martial Mancip, Thomas Launois and Kun Tan will do a mega-merge (marked 2 on the figure) between the Mini-merge and orchidee_1_9_5, (3) This version will be submitted to svn (marked 3 on this figure), from which the FORESTRY groups starts using the svn system + tickets and (4) All will use their own personal version, regular meetings should guarantee a slim branch. |