hi,
we had a wrong merge in the php-src, merging master into PHP-7.1. I've just
force pushed the last good version before the bogus merge(
6fbd61a8199fbac9aac25d0dfaf1402a8f2b4e7b). You can find the bogus state at
https://github.com/Tyrael/php-src/tree/7.1.0-broken if you happen to have
some commits which you still want to have in PHP-7.1.
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 7.1
(and master accordingly) branch aside and reset to upstream, then cherry
pick local changes.
This might be an approach:
$ git checkout PHP-7.1 # Go to your local 7.1 branch
$ git pull # Results in error "can't fast-forward"
$ git branch backup-7.1 # create a backup
$ git reset --hard origin/PHP-7.1
# Overwrite local 7.1 with upstream
$ gitk PHP-7.1 backup-7.1 # Investigate changes, cherry pick etc.
$ git branch -D backup-7.1 # Remove backup (warning: no
# confirmation before deletion, be sure
# there's none of your work left!)