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 sho
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
apol
Hi Anatol!
On 12.10.2016 at 16:33, Anatol Belski wrote:
>> -Original Message-
>> From: Christoph M. Becker [mailto:cmbecke...@gmx.de]
>> Sent: Wednesday, October 12, 2016 4:26 PM
>> To: PHP Internals
>> Subject: [PHP-DEV] Merging PHP-5.6 into PHP-7.0 conflicts
>>
>> Hi!
>>
>> It seems th
Hi Christoph,
> -Original Message-
> From: Christoph M. Becker [mailto:cmbecke...@gmx.de]
> Sent: Wednesday, October 12, 2016 4:26 PM
> To: PHP Internals
> Subject: [PHP-DEV] Merging PHP-5.6 into PHP-7.0 conflicts
>
> Hi!
>
> It seems there has been an unresolved bad merge. When I atte
