hi,
we had a wrong merge in the php-src, merging master into 5.6. I've just
force pushed the last good version before the bogus merge. You can find the
bogus state at https://github.com/tyrael/php-src/tree/broken-5.6-20140206
if you happen to have some commits which you still want to have in PHP-5.6.
In case you *pulled* between that wrong merge and the fix git will
reject doing a fast forward merge in that case please put your local 5.6
(and master accordingly) branch aside and reset to upstream, then cherry
pick local changes.
This might be an approach:
$ git checkout PHP-5.6 # Go to your local 5.6 branch
$ git pull # Results in error "can't fast-forward"
$ git branch backup-5.6 # create a backup
$ git reset --hard origin/PHP-5.6
# Overwrite local 5.6 with upstream
$ gitk PHP-5.6 backup-5.6 # Investigate changes, cherry pick etc.
$ git branch -D backup-5.6 # Remove backup (warning: no
# confirmation before deletion, be sure
# there's none of your work left!)
