Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:96334 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 30263 invoked from network); 13 Oct 2016 05:11:37 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 13 Oct 2016 05:11:37 -0000 Authentication-Results: pb1.pair.com header.from=smalyshev@gmail.com; sender-id=pass Authentication-Results: pb1.pair.com smtp.mail=smalyshev@gmail.com; spf=pass; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.213.171 as permitted sender) X-PHP-List-Original-Sender: smalyshev@gmail.com X-Host-Fingerprint: 209.85.213.171 mail-yb0-f171.google.com Received: from [209.85.213.171] ([209.85.213.171:33188] helo=mail-yb0-f171.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 70/0A-41968-7871FF75 for ; Thu, 13 Oct 2016 01:11:37 -0400 Received: by mail-yb0-f171.google.com with SMTP id e20so26988538ybb.0 for ; Wed, 12 Oct 2016 22:11:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=OFDkizUFmvpQe2UpZPD2rdK56WwEaMUD1Xn7cdZzV6s=; b=wY0B/x1wdcXY3vcxkkFrICrIwgZPYNhpf8QfRhtLzRCg7Z9GxmMTx3QjlB6A0IczTW bEFYCqWMjHf08AwB0gNLFAfnAuJwMRII8pcoDvrRnDbT9p/g0tqL2Mu4eian90zBrmt8 WLW7HWMgi1hvdLclmbs+HGs5nDROQyxuI5mQU5pAW16wgFkCCfrzmK+THH+ukXRtJl/m UYMXQDxy6bNM7PcjmXZ9REFwaaYBO5cdja484ClG3Ox543QpKE1Zg+lXJP+7/NdPIyOr Yq/Guw/4qjydOkoybM6QaIh2jpezFpsMF6TMhylNAuyiAuDdDNhmDsCoh4eaCuXozYJ4 tiwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=OFDkizUFmvpQe2UpZPD2rdK56WwEaMUD1Xn7cdZzV6s=; b=AB5HAmUZCLmsZbezfEuK2GQdPD0WgP7MSW9DRlRhMfSVzPLbHRZ1wSd1dwNaogZQtJ 6QEY9+5Z8+GkSdo+qtDD6F9fmqSmARKLBpHsNvBGRBul7j3yKzzV2n9HTbuZsCw651ne ZA0ua2eGY0JiOpHzMpEVvUiRlaCix7lEwOBioePouyXchm4qkNxOh1gXgVL/m2iknCs0 pSwZfXPvL6FP/gWn7A4w1gwG/fsCsMokjJT4yDq35c43edrVtfnVnGyc4/FH6Wf/vCCO ApjRgf88GmxXmgbMwwMj+xXhYNcUBgQr6VYILKiCbxbPTVK5+bzF3LH2c5h9xOpvhJaQ cBMA== X-Gm-Message-State: AA6/9RmTjlFjwyPUXJtnWY2/5JupALiivC6yUDOCc2ieMsovSPqBsqkL0lt9xonh08Ik7w== X-Received: by 10.37.173.150 with SMTP id z22mr4135723ybi.126.1476335493212; Wed, 12 Oct 2016 22:11:33 -0700 (PDT) Received: from Stas-Air.local (108-233-206-104.lightspeed.sntcca.sbcglobal.net. [108.233.206.104]) by smtp.gmail.com with ESMTPSA id g123sm4109511ywd.30.2016.10.12.22.11.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Oct 2016 22:11:32 -0700 (PDT) To: "Christoph M. Becker" , Anatol Belski , 'PHP Internals' References: <0e0887f9-f4dc-862b-0427-33c2e8b4d739@gmx.de> <006f01d22495$a7463950$f5d2abf0$@belski.net> <04faecb2-4f39-06ae-3d7b-e96eaa37f9d6@gmx.de> Message-ID: <0ff66091-4024-85ea-fd92-f01c23aabd46@gmail.com> Date: Wed, 12 Oct 2016 22:11:31 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <04faecb2-4f39-06ae-3d7b-e96eaa37f9d6@gmx.de> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [PHP-DEV] Merging PHP-5.6 into PHP-7.0 conflicts From: smalyshev@gmail.com (Stanislav Malyshev) Hi! >>> It seems there has been an unresolved bad merge. When I attempt an empty >>> merge from PHP-5.6 into PHP-7.0, Git reports 18 conflicting files. Sorry, that was caused by 5.6 security fixes being in progress of being merged. I should have sent a message to internals, but forgot to. I apologize. Will do so in the future when starting big merges that may leave the repos in a weird state for a while. -- Stas Malyshev smalyshev@gmail.com