Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:96337
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmx.de designates 212.227.15.19 as permitted sender)
To: Stanislav Malyshev <smalyshev@gmail.com>,
 Anatol Belski <anatol.php@belski.net>,
 'PHP Internals' <internals@lists.php.net>
References: <0e0887f9-f4dc-862b-0427-33c2e8b4d739@gmx.de>
 <006f01d22495$a7463950$f5d2abf0$@belski.net>
 <04faecb2-4f39-06ae-3d7b-e96eaa37f9d6@gmx.de>
 <0ff66091-4024-85ea-fd92-f01c23aabd46@gmail.com>
Message-ID: <bf970bb3-f378-7633-9b98-7f98352e5578@gmx.de>
Date: Thu, 13 Oct 2016 11:52:19 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101
 Thunderbird/45.4.0
MIME-Version: 1.0
In-Reply-To: <0ff66091-4024-85ea-fd92-f01c23aabd46@gmail.com>
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: cmbecker69@gmx.de ("Christoph M. Becker")

Hi!

On 13.10.2016 at 07:11, Stanislav Malyshev wrote:

>>>> 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.

Thanks! :-)

--
Christoph M. Becker