RE: [PHP-DEV] Merging PHP-5.6 into PHP-7.0 conflicts
| From: | Anatol Belski | Date: | Wed, 12 Oct 2016 14:33:48 +0000 |
| Subject: | RE: [PHP-DEV] Merging PHP-5.6 into PHP-7.0 conflicts | ||
| References: | 1 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-96329@lists.php.net to get a copy of this message | ||
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