Recent proposition from Andreas is I think a good booster for trunk
squeak development.
However, as Keith underlined, it is not a model for cross-fork development.

You want a simple example?
Try merging source.squeak.org/trunk/Kernel and www.squeaksource.com/Pharo/Kernel
Too many methods changed... and are marked as conflicting.
Cross-fork management requires a much finer grain for sure!
We have to sharpen our tools or invent something...

Nicolas