Hey folks, I have a bit of a mystery on my hands.
Yasuo brought to my attention last night that it looked like someone had merged master into the PHP-7.1 branch, and indeed when Joe and I tried to build today that was the case. Proof: https://github.com/php/php-src/blob/PHP-7.1/main/php_version.h Now, I used `git when-merged`[1] to figure out when it was merged and came up with the following commit: commit 4a3188f0935211332cc3a545673e882331b14504 Merge: dc9ae10 f41b69e Author: Yasuo Ohgaki <yohg...@php.net> Date: Wed Aug 10 09:39:17 2016 +0900 However, the date on it is Aug 10, and I have video proof from Aug ~29th (RC1 build) that it wasn't there then. My local PHP-7.1 branch also does not have this commit, and it's last commit was: commit 50059639c86a10fe11d6ec3eec2e690ee77afccc Author: Davey Shafik <m...@daveyshafik.com> Date: Wed Oct 5 13:07:47 2016 -0700 So that means it was merged in the last 8 days. Can anyone shed some light on: 1) when it was merged 2) who merged it 3) how the dates are messed up 4) how to fix it Also: at this point, I'd like to ask for NO FURTHER COMMITS TO THE 7.1 BRANCH while this is sorted out. Thanks all, - Davey [1] https://github.com/mhagger/git-when-merged
