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 -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
