[hibernate-dev] Does anyone know of any HQL internal changes between Hibernate 4.0.0.Beta3 and 4.0.0.Beta4?
Hardy Ferentschik
hardy at hibernate.org
Wed Aug 3 03:29:53 EDT 2011
On Tue, 02 Aug 2011 23:03:47 +0200, Scott Marlow <smarlow at redhat.com>
wrote:
> I pulled my commit but it came out wrong
> (5dc04960d6ccb4f54f49c2fac83a0ccd2874fa2f merge got created). It looks
> like I should of rebased the commit on my local master branch before
> doing the pull request. It looks like git merged my change and Hardy's
> (from earlier today).
>
> One thing that is worse than what I did, is rebasing after the fact (I
> think). Rather than making this worse, I'll wait for feedback from
> others that have been through this.
No problem. This is not the first merge commit (see
https://github.com/hibernate/hibernate-core/network).
Rebasing now and doing a forced push would definitely be worse now,
especially since Gail
committed in the meantime as well.
--Hardy
More information about the hibernate-dev
mailing list