Merging PHP-5.6 into PHP-7.0 conflicts

9 years ago by Christoph M. Becker — view source — reply

unread

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

9 years ago by Anatol Belski — view source — reply

unread

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

9 years ago by Christoph M. Becker — view source — reply

unread

Hi Anatol!

-----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

9 years ago by Stanislav Malyshev — view source — reply

unread

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

9 years ago by Christoph M. Becker — view source — reply

unread

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.

Thanks! :-)

--
Christoph M. Becker