Everything

php

Merging PHP-5.6 into PHP-7.0 conflicts

php.internals

Christoph Becker

9 years ago

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.

Can somebody please have a look at this issue.

--
Christoph M. Becker

Anatol Belski

9 years ago

Hi Christoph,

> -----Original Message-----
> From: Christoph M. Becker [mailto:cmbecker69@gmx.de]
> Sent: Wednesday, October 12, 2016 4:26 PM
> To: PHP Internals <internals@lists.php.net>
> Subject: [PHP-DEV] Merging PHP-5.6 into PHP-7.0 conflicts
>
> 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.
>
> Can somebody please have a look at this issue.
>

Yeah, there are some patches not merged yet. I'm doing the porting work ATM, it should be resolved later today or tomorrow as latest.

Thanks

Anatol

Christoph Becker

9 years ago

Hi Anatol!

On 12.10.2016 at 16:33, Anatol Belski wrote:

>> -----Original Message-----
>> From: Christoph M. Becker [mailto:cmbecker69@gmx.de]
>> Sent: Wednesday, October 12, 2016 4:26 PM
>> To: PHP Internals <internals@lists.php.net>
>> Subject: [PHP-DEV] Merging PHP-5.6 into PHP-7.0 conflicts
>>
>> 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.
>>
>> Can somebody please have a look at this issue.
>>
> Yeah, there are some patches not merged yet. I'm doing the porting work ATM, it should be resolved later today or tomorrow as latest.

Thanks! (also for the quick reply)

--
Christoph M. Becker

Stas Malyshev

9 years ago

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

Christoph Becker

9 years ago

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