Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:96363
Return-Path: <yohgaki@ohgaki.net>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 55115 invoked from network); 14 Oct 2016 02:09:12 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 14 Oct 2016 02:09:12 -0000
Authentication-Results: pb1.pair.com smtp.mail=yohgaki@ohgaki.net; spf=pass; sender-id=pass
Authentication-Results: pb1.pair.com header.from=yohgaki@ohgaki.net; sender-id=pass
Received-SPF: pass (pb1.pair.com: domain ohgaki.net designates 180.42.98.130 as permitted sender)
X-PHP-List-Original-Sender: yohgaki@ohgaki.net
X-Host-Fingerprint: 180.42.98.130 ns1.es-i.jp  
Received: from [180.42.98.130] ([180.42.98.130:52499] helo=es-i.jp)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id 83/0C-41968-64E30085 for <internals@lists.php.net>; Thu, 13 Oct 2016 22:09:12 -0400
Received: (qmail 127921 invoked by uid 89); 14 Oct 2016 02:09:07 -0000
Received: from unknown (HELO mail-qk0-f172.google.com) (yohgaki@ohgaki.net@209.85.220.172)
  by 0 with ESMTPA; 14 Oct 2016 02:09:07 -0000
Received: by mail-qk0-f172.google.com with SMTP id o68so169780534qkf.3
        for <internals@lists.php.net>; Thu, 13 Oct 2016 19:09:07 -0700 (PDT)
X-Gm-Message-State: AA6/9RmHrWk/4jhWHAQO+iBNfQYIp42M6JHt0DaqDYGjJ1C16Q8AOjFIFDTBwd24xtNHbr7bxa7cmpAUyBg89A==
X-Received: by 10.55.121.133 with SMTP id u127mr9208910qkc.233.1476410941533;
 Thu, 13 Oct 2016 19:09:01 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.140.84.168 with HTTP; Thu, 13 Oct 2016 19:08:21 -0700 (PDT)
In-Reply-To: <028301d225a7$20292820$607b7860$@belski.net>
References: <1476398223.13824.1.camel@kuechenschabe> <028301d225a7$20292820$607b7860$@belski.net>
Date: Fri, 14 Oct 2016 11:08:21 +0900
X-Gmail-Original-Message-ID: <CAGa2bXb_sP1XeH0sn-pFA_y0t0UyekNRio5NpNvtW5JiscZe2w@mail.gmail.com>
Message-ID: <CAGa2bXb_sP1XeH0sn-pFA_y0t0UyekNRio5NpNvtW5JiscZe2w@mail.gmail.com>
To: Anatol Belski <anatol.php@belski.net>
Cc: =?UTF-8?Q?Johannes_Schl=C3=BCter?= <johannes@php.net>, 
	PHP internals list <internals@lists.php.net>, Davey Shafik <davey@php.net>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [PHP-DEV] IMPORTANT: Git reset after wrong merge
From: yohgaki@ohgaki.net (Yasuo Ohgaki)

Hi Anatol,

On Fri, Oct 14, 2016 at 8:11 AM, Anatol Belski <anatol.php@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 some point tomorrow.

I already pushed UPGRADING. This should be harmless.
I'll retain other changes, if any.

Regards,

--
Yasuo Ohgaki
yohgaki@ohgaki.net