Would we merge the directories on each branch and then merge branches? >From what little I know of git I think this would be best. On Jun 5, 2012 8:30 AM, "Hardy Ferentschik" <ha...@hibernate.org> wrote:
> > On Jun 5, 2012, at 2:32 PM, Steve Ebersole wrote: > > > I want to start discussing a plan to integrate the master and metamodel > > branches together. > > > > One point of discussion is whether we want to pull master over on to > > metamodel on a regular basis or whether we want to just wait until the > > "very end" and do a single painful integration. > > +1 for regular integration > > > I did some searches and > > found quite a few recommendations for ongoing integration; however, they > > all specifically mentioned merges over rebasing. > > I think now we definitely would need a merge (basically what the guys on > stack overflow recommend) > After the initial merge I think we could to rebases for the regular > integrations > if we do them often enough. It will require some discipline from everyone, > since > we will need to coordinate these rebases. One a rebased metamodel is pushed > to the main repo everyone will need to make sure not to continue working > of this. > I guess what I am saying is that there is a little more effort for > everyone involved here. > I think it would be worth it though. > > +1 for getting test + matrix together asap. > > --Hardy > > > _______________________________________________ hibernate-dev mailing list hibernate-dev@lists.jboss.org https://lists.jboss.org/mailman/listinfo/hibernate-dev
