Hi, I found a problem in the PHP WIki. On IRC it was suggested that I open a bug report (#62611) and email internals.
https://wiki.php.net/vcs/gitworkflow has wrong directions for 'Workflow for external contributors'. After `git remote...` you need to call `git fetch upstream` and the rebase needs to be `git pull --rebase upstream PHP-5.4 (or use upstream master)`. Have a great day! -- Lonny Kapelushnik http://lonnylot.com (732) 807-5509