Re: NEWS and UPGRADING files in PHP-5.6
On Thu, Feb 6, 2014 at 10:02 AM, Ferenc Kovacs <[email protected]> wrote:
>
>
>
> On Thu, Feb 6, 2014 at 9:53 AM, Bob Weinand <[email protected]> wrote:
>
>> These two files in PHP-5.6 branch actually are the same than master.
>>
>> I just noticed that when I wanted to write about the merge of pow
>> operator RFC…
>>
>> Could someone please fix that one?
>>
>> Bob
>> --
>> PHP Internals - PHP Runtime Development Mailing List
>> To unsubscribe, visit: http://www.php.net/unsub.php
>>
>>
> from a quick look it seems that your last merge caused it, will revert it,
> if nobody beats me to it.
>
> --
> Ferenc Kovács
> @Tyr43l - http://tyrael.hu
>
yep, it seems that you've merged a branch/PR which was originally branched
from master.
in the past when similar thing happened we always reset the head before the
merge and then force push it.
I don't have karma for that, but I can grant myself if nobody around
(johannes?)
--
Ferenc Kovács
@Tyr43l - http://tyrael.hu
Thread (7 messages)