Re: [hibernate-dev] Does anyone know of any HQL internal changes between Hibernate 4.0.0.Beta3 and 4.0.0.Beta4?
On Thu, 04 Aug 2011 14:17:07 +0200, Scott Marlow <smarlow(a)redhat.com>
wrote:
> Hi Scott, from the network graph it looks like your commit was
fine
> and should have been fast-forwarded, so I don't think there's
> something wrong with your repository.
>
> Are you using the github web ui to handle the pull request? If so,
> that one is always going to introduce a merge commit, so we avoid it.
Yes, I used the github web ui. I won't be pressing that button a 3rd
time.
FYI, https://github.com/blog/843-the-merge-button
"The merge always generates a merge commit (git merge --no-ff), which
contains the number, source and title of the pull request"
Now, why the '--no-ff' is forced I really don't know. I did a couple of
pull requests merges in Validator until I realized
that there will always be a merge commit. After that I went back to the
command line :-)
--Hardy