[hibernate-dev] forced update

[Sanne Grinovero]

This not looking good at all; I just tried myself to "git fetch upstream"
and got :
>From github.com:hibernate/hibernate-orm
 + d8d1019...92f42e7 3.6        -> upstream/3.6  (forced update)
 + 78d07a3...88c08c0 4.0        -> upstream/4.0  (forced update)
   fb3566b..6258df4  master     -> upstream/master

Worst thing, it looks like 4.0 was merged into 3.6, and forced. 3.6 is gone!

master and 4.0 also look very similar: they have only 10 patches of
difference, I hope that's correct?

I'll be on IRC soon to help if I can, but unfortunately I don't have a
recent pull from 3.6: mine dates back to November.
If anyone has one.. please don't update from upstream and make a new
branch of it as a backup!


On 24 January 2012 04:54, Steve Ebersole <steve at hibernate.org> wrote:
> Maybe I am just paranoid because of the recent lost commits stuff, but
> today I did a pull and got this:
>
>  + d8d1019...92f42e7 3.6        -> origin/3.6  (forced update)
>
> Why a force?  To the best of my knowledge I did not have any non-pushed
> commits on that 3.6 branch.
>
> --
> steve at hibernate.org
> http://hibernate.org
> _______________________________________________
> hibernate-dev mailing list
> hibernate-dev at lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/hibernate-dev