Newsgroups: php.cvs,php.internals
Path: news.php.net
Xref: news.php.net php.cvs:93237 php.internals:94589
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 74.125.82.45 as permitted sender)
MIME-Version: 1.0
Sender: tyra3l@gmail.com
Date: Wed, 20 Jul 2016 17:27:33 +0200
Message-ID: <CAH-PCH5K87=JURa3ifAAn8KLYA3dnc7SqLyTX9hLndz_RLwQKQ@mail.gmail.com>
To: PHP Internals <internals@lists.php.net>, 
	"php-cvs@lists.php.net" <php-cvs@lists.php.net>
Content-Type: multipart/alternative; boundary=047d7b67086f2925ce053812d748
Subject: force push in php-src
From: tyrael@php.net (Ferenc Kovacs)

--047d7b67086f2925ce053812d748
Content-Type: text/plain; charset=UTF-8

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!)

--047d7b67086f2925ce053812d748--