On 18 July 2010 02:58, Marc Weustink wrote: > > I don't doubt the ability to merge, but will it result in usable/meaningfull > code too ?
A silly question. Just take a look in the Git and Linux Kernel repository histories. Octopus Merges and normal 2-branch merges happen all the time, and in both projects the code works just fine afterwards. [ Like a good net-citizen, I see we are getting off-topic. (beating Jonas to the punch) ;-) ] -- Regards, - Graeme - _______________________________________________ fpGUI - a cross-platform Free Pascal GUI toolkit http://opensoft.homeip.net/fpgui/ _______________________________________________ fpc-devel maillist - fpc-devel@lists.freepascal.org http://lists.freepascal.org/mailman/listinfo/fpc-devel
