Discussion attached.
We decided to handle integration between the master and metamodel
branches by doing intermediate merges from master to metamodel and
ultimately rebasing metamodel on top of master for the final integration.
--
steve(a)hibernate.org
http://hibernate.org