> -----Original Message-----
> From: Yasuo Ohgaki [mailto:yohg...@ohgaki.net]
> Sent: Friday, October 14, 2016 4:08 AM
> To: Anatol Belski <anatol....@belski.net>
> Cc: Johannes Schlüter <johan...@php.net>; PHP internals list
> <firstname.lastname@example.org>; Davey Shafik <da...@php.net>
> Subject: Re: [PHP-DEV] IMPORTANT: Git reset after wrong merge
> Hi Anatol,
> On Fri, Oct 14, 2016 at 8:11 AM, Anatol Belski <anatol....@belski.net> wrote:
> > Yeah, we'll be checking to restore the missing 7.1 commits. Currently merges
> 7.0 to 7.1, or 7.1 to master, might have issues. I'd ask to please retain from
> pushing there, until the branch is restored. Hopefully this will happen at
> point tomorrow.
> I already pushed UPGRADING. This should be harmless.
> I'll retain other changes, if any.
Many thanks for checking. It went faster than I thought, so it should be
already possible to push an do the merges. Though it'd not hurt to check
everything is in order before. So I'd make sense to wait like half a day or so
for everyone to look over the branch before starting with some "heavy" things :)
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php