On Jun 1, 2011, at 7:18 PM, Hardy Ferentschik wrote: > On Wed, 01 Jun 2011 13:13:09 +0200, Steve Ebersole <st...@hibernate.org> > wrote: > >> On 06/01/2011 05:14 AM, Steve Ebersole wrote: >>> I did a pull+rebase. The rebase had conflicts. But I never found a way >>> to continue the rebase initiated from pull. I thought `git rebase >>> --continue`was the incantation, but it was not working. So I guess >>> conceivably there were additional commits still to process which would >>> explain the missing commits. >>> >>> Is there a way to revert my forced push and I can try again? >> >> I guess that is what you did Strong? >> https://github.com/hibernate/hibernate-core/commit/7a187648932f33b0b8138b2968742372ca6c61a7 > > We pushed our version of the repository (forced) and then applied the > changes you > committed and we didn't have yet on top of it. Master should contain now > the work from everyone :-) > > No need for you to re-commit anything. Just make sure that you sync > properly w/ master now.
yep, and btw, don't you need sleep? :D > > --Hardy > _______________________________________________ > hibernate-dev mailing list > hibernate-dev@lists.jboss.org > https://lists.jboss.org/mailman/listinfo/hibernate-dev _______________________________________________ hibernate-dev mailing list hibernate-dev@lists.jboss.org https://lists.jboss.org/mailman/listinfo/hibernate-dev
