Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:72332 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 57500 invoked from network); 6 Feb 2014 10:31:57 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 6 Feb 2014 10:31:57 -0000 Authentication-Results: pb1.pair.com smtp.mail=tyra3l@gmail.com; spf=pass; sender-id=pass Authentication-Results: pb1.pair.com header.from=tyra3l@gmail.com; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.216.49 as permitted sender) X-PHP-List-Original-Sender: tyra3l@gmail.com X-Host-Fingerprint: 209.85.216.49 mail-qa0-f49.google.com Received: from [209.85.216.49] ([209.85.216.49:59037] helo=mail-qa0-f49.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 39/B0-52146-C9463F25 for ; Thu, 06 Feb 2014 05:31:56 -0500 Received: by mail-qa0-f49.google.com with SMTP id w8so2399264qac.8 for ; Thu, 06 Feb 2014 02:31:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=BIFe1g3DaqRaOF1gbxIqNFtCbZvpfUq1ga5SiWARMmw=; b=EwXwagMQb0+2PnGjUwZOk11WfDXO9qfFvM7Y0PgfCCtxE2uJEhO/mQISC84/CQfJyR xDu4/I9hBY0KLnOhknVIwc7CNt2TUo8EPuvaqMYJGN1F80+QHREQJ5JLbfEr6pd9dDZy fLKyLcXzXNXqjp+w7daSJ/o9hOQjIClYqf2sXZvqk7NINEu/mhu5ls+7ITfMLMfYoih1 cSj/plnNJ9oyd/Nx6aufMFY6q7eTdv9UNEKS2OBeXF1x3z0hIoU5AwRL4P0UbvXBwGaB qZWAZbu16V6qk+gY1taw4jjohj7REbpoYh8a9gdrSCaAAKh9rJuS6e3D+uymi2rqIC7y 72qw== MIME-Version: 1.0 X-Received: by 10.140.88.180 with SMTP id t49mr10347968qgd.97.1391682713801; Thu, 06 Feb 2014 02:31:53 -0800 (PST) Received: by 10.140.96.70 with HTTP; Thu, 6 Feb 2014 02:31:53 -0800 (PST) In-Reply-To: References: Date: Thu, 6 Feb 2014 11:31:53 +0100 Message-ID: To: Bob Weinand , =?UTF-8?Q?Johannes_Schl=C3=BCter?= Cc: List PHP Mailing List Content-Type: multipart/alternative; boundary=001a11c13b10cbda9204f1ba61fc Subject: Re: [PHP-DEV] NEWS and UPGRADING files in PHP-5.6 From: tyra3l@gmail.com (Ferenc Kovacs) --001a11c13b10cbda9204f1ba61fc Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Thu, Feb 6, 2014 at 10:02 AM, Ferenc Kovacs wrote: > > > > On Thu, Feb 6, 2014 at 9:53 AM, Bob Weinand wrote: > >> These two files in PHP-5.6 branch actually are the same than master. >> >> I just noticed that when I wanted to write about the merge of pow >> operator RFC=E2=80=A6 >> >> Could someone please fix that one? >> >> Bob >> -- >> PHP Internals - PHP Runtime Development Mailing List >> To unsubscribe, visit: http://www.php.net/unsub.php >> >> > from a quick look it seems that your last merge caused it, will revert it= , > if nobody beats me to it. > > -- > Ferenc Kov=C3=A1cs > @Tyr43l - http://tyrael.hu > yep, it seems that you've merged a branch/PR which was originally branched from master. in the past when similar thing happened we always reset the head before the merge and then force push it. I don't have karma for that, but I can grant myself if nobody around (johannes?) --=20 Ferenc Kov=C3=A1cs @Tyr43l - http://tyrael.hu --001a11c13b10cbda9204f1ba61fc--