> -----Original Message-----
> From: Christoph M. Becker [mailto:cmbecke...@gmx.de]
> Sent: Wednesday, October 12, 2016 4:26 PM
> To: PHP Internals <firstname.lastname@example.org>
> Subject: [PHP-DEV] Merging PHP-5.6 into PHP-7.0 conflicts
> 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.
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php