Re: Merging PHP-5.6 into PHP-7.0 conflicts
| From: | Stanislav Malyshev | Date: | Thu, 13 Oct 2016 05:11:31 +0000 |
| Subject: | Re: Merging PHP-5.6 into PHP-7.0 conflicts | ||
| References: | 1 2 3 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-96334@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.
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