Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:96365
Return-Path: <anatol.php@belski.net>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 58553 invoked from network); 14 Oct 2016 02:31:39 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 14 Oct 2016 02:31:39 -0000
Authentication-Results: pb1.pair.com header.from=anatol.php@belski.net; sender-id=unknown
Authentication-Results: pb1.pair.com smtp.mail=anatol.php@belski.net; spf=permerror; sender-id=unknown
Received-SPF: error (pb1.pair.com: domain belski.net from 85.214.73.107 cause and error)
X-PHP-List-Original-Sender: anatol.php@belski.net
X-Host-Fingerprint: 85.214.73.107 klapt.com  
Received: from [85.214.73.107] ([85.214.73.107:38895] helo=h1123647.serverkompetenz.net)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id D3/BC-41968-98340085 for <internals@lists.php.net>; Thu, 13 Oct 2016 22:31:38 -0400
Received: by h1123647.serverkompetenz.net (Postfix, from userid 1006)
	id 2EC567849CC; Fri, 14 Oct 2016 04:31:35 +0200 (CEST)
Received: from w530phpdev (p54A7671F.dip0.t-ipconnect.de [84.167.103.31])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by h1123647.serverkompetenz.net (Postfix) with ESMTPSA id D95077849C5;
	Fri, 14 Oct 2016 04:31:32 +0200 (CEST)
To: "'Yasuo Ohgaki'" <yohgaki@ohgaki.net>
Cc: =?utf-8?Q?'Johannes_Schl=C3=BCter'?= <johannes@php.net>,
	"'PHP internals list'" <internals@lists.php.net>,
	"'Davey Shafik'" <davey@php.net>
References: <1476398223.13824.1.camel@kuechenschabe> <028301d225a7$20292820$607b7860$@belski.net> <CAGa2bXb_sP1XeH0sn-pFA_y0t0UyekNRio5NpNvtW5JiscZe2w@mail.gmail.com>
In-Reply-To: <CAGa2bXb_sP1XeH0sn-pFA_y0t0UyekNRio5NpNvtW5JiscZe2w@mail.gmail.com>
Date: Fri, 14 Oct 2016 04:31:28 +0200
Message-ID: <02f001d225c3$13f9e3c0$3bedab40$@belski.net>
MIME-Version: 1.0
Content-Type: text/plain;
	charset="utf-8"
Content-Transfer-Encoding: quoted-printable
X-Mailer: Microsoft Outlook 16.0
Thread-Index: AQLbzZO1yl4fvt2bP/TlJAz0d3Fu3QLYxvDmAtNQoiaeZokAAA==
Content-Language: en-us
Subject: RE: [PHP-DEV] IMPORTANT: Git reset after wrong merge
From: anatol.php@belski.net ("Anatol Belski")

Hi Yasuo,

> -----Original Message-----
> From: Yasuo Ohgaki [mailto:yohgaki@ohgaki.net]
> Sent: Friday, October 14, 2016 4:08 AM
> To: Anatol Belski <anatol.php@belski.net>
> Cc: Johannes Schl=C3=BCter <johannes@php.net>; PHP internals list
> <internals@lists.php.net>; Davey Shafik <davey@php.net>
> Subject: Re: [PHP-DEV] IMPORTANT: Git reset after wrong merge
>=20
> Hi Anatol,
>=20
> 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.
>=20
> I already pushed UPGRADING. This should be harmless.
> I'll retain other changes, if any.
>=20
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 :)

Thanks

Anatol