Re: [hibernate-dev] merge master onto metamodel regularly

From: "Steve Ebersole" <steve(a)hibernate.org&gt; To: "Strong Liu" <stliu(a)hibernate.org&gt; Cc: "Hibernate hibernate-dev" <hibernate-dev(a)lists.jboss.org&gt; Sent: Tuesday, March 19, 2013 10:51:05 AM Subject: Re: [hibernate-dev] merge master onto metamodel regularly +1000 for me On 03/19/2013 11:29 AM, Strong Liu wrote: > Hi there, > > I just finished the merge of master onto metamodel, and there were > tons of conflicts :( > > I'm suggesting we ( well, I'm voluntary to do this ) do the merge > by weekly, to minimise the conflicts > I will do the merge in every monday ( my time ) if no objections, > so, others living in U.S. and Europe can see the merged branch > when starts the Monday work > > WDYT? > > > ------------------------- > Best Regards, > > Strong Liu <stliu at hibernate.org> > http://about.me/stliu/bio > > > > _______________________________________________ > hibernate-dev mailing list > hibernate-dev(a)lists.jboss.org > https://lists.jboss.org/mailman/listinfo/hibernate-dev _______________________________________________ hibernate-dev mailing list hibernate-dev(a)lists.jboss.org https://lists.jboss.org/mailman/listinfo/hibernate-dev