[hibernate-dev] Branching strategy in OGM