Nonetheless, as you indicate, it is likely to create many clashes. What do the other developers on this list say? Should we first try to get rid of some of our branches in the various projects in order to reduce the fall-out from "osmo_" prefixing some of our core functions?
Coincidentally, I was just looking at moving g2-loader to master again :) (although this branch probably won't be affected by the above change).
Regards,
Wolfram