Merging PHP-5.6 into PHP-7.0 conflicts
| From: | Christoph M. Becker | Date: | Wed, 12 Oct 2016 14:25:40 +0000 |
| Subject: | Merging PHP-5.6 into PHP-7.0 conflicts | ||
| Groups: | php.internals | ||
| Request: | Send a blank email to internals+get-96328@lists.php.net to get a copy of this message | ||
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