# NEWS and UPGRADING files in PHP-5.6 - Thread: https://externals.io/message/72329 - Original archive: https://news-web.php.net/php.internals/72329 - Started by Bob Weinand on 2014-02-06T08:53:01+00:00 - Messages: 7 - Reply by email to internals@lists.php.net - More for agents: search with https://externals.io/search.md?q={query} · JSON API at https://externals.io/api · documentation at https://externals.io/llms.txt --- ## #72329 — Bob Weinand — 2014-02-06T08:53:01+00:00 URL: https://externals.io/message/72329#72329 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 --- ## #72330 — Ferenc Kovacs — 2014-02-06T09:02:11+00:00 URL: https://externals.io/message/72329#72330 · In reply to: #72329 > 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 > -- > > > > 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 --- ## #72332 — Ferenc Kovacs — 2014-02-06T10:31:53+00:00 URL: https://externals.io/message/72329#72332 · In reply to: #72330 > > > > > > > […] > 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 --- ## #72334 — Ferenc Kovacs — 2014-02-06T11:13:56+00:00 URL: https://externals.io/message/72329#72334 · In reply to: #72332 > > > > > > > […] > > 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 > Hi, I've restored the tip of the PHP-5.6 and master branch to where it was before the merge. The branch which holds the wrong merge is available here: http://git.php.net/?p=php-src.git;a=shortlog;h=refs/heads/broken-5.6-20140206 If you pulled between the wrong merge and the fix (~2 hours of timeframe), then you have to put your local 5.6 and master branch aside and reset those to the origin and cherrypick your local changes if you have any. Bob: please rebase/cherrypick your changes to the PHP-5.6 branch first, and merge that upwards to master, otherwise you will bring along the other commits from the master branch. -- Ferenc Kovács @Tyr43l - http://tyrael.hu --- ## #72335 — Tjerk Meesters — 2014-02-06T13:02:22+00:00 URL: https://externals.io/message/72329#72335 · In reply to: #72334 Hi Ferenc, > > > > […] > > > Hi, > > I've restored the tip of the PHP-5.6 and master branch to where it was > before the merge. > The branch which holds the wrong merge is available here: > http://git.php.net/?p=php-src.git;a=shortlog;h=refs/heads/broken-5.6-20140206 > If you pulled between the wrong merge and the fix (~2 hours of timeframe), > then you have to put your local 5.6 and master branch aside and reset those > to the origin and cherrypick your local changes if you have any. > Bob: please rebase/cherrypick your changes to the PHP-5.6 branch first, and > merge that upwards to master, otherwise you will bring along the other > commits from the master branch. Thanks. Was there something I should have done differently with my PR or are branches off master okay? > > -- > Ferenc Kovács > @Tyr43l - http://tyrael.hu --- ## #72337 — Ferenc Kovacs — 2014-02-06T13:16:14+00:00 URL: https://externals.io/message/72329#72337 · In reply to: #72335 On Thu, Feb 6, 2014 at 2:02 PM, Tjerk Meesters wrote: > Hi Ferenc, > > > […] > wrote: > > […] > wrote: > > […] > wrote: > > […] > branched > > […] > http://git.php.net/?p=php-src.git;a=shortlog;h=refs/heads/broken-5.6-20140206 > > […] > timeframe), > > […] > those > > […] > and > > […] > > Thanks. Was there something I should have done differently with my PR or > are branches off master okay? > > > […] > Yeah, the problem was that the PR was targeted to master (as you can see at https://github.com/php/php-src/pull/543), while the RFC targeted 5.6 ( https://wiki.php.net/rfc/pow-operator#proposed_php_version_s) Ofc. the person doing the merge could have realized this and either rebase himself, or ask you to send another PR, but next time make sure that you base the PR on the correct branch. -- Ferenc Kovács @Tyr43l - http://tyrael.hu --- ## #72340 — Tjerk Meesters — 2014-02-06T14:14:23+00:00 URL: https://externals.io/message/72329#72340 · In reply to: #72337 > > > > On Thu, Feb 6, 2014 at 2:02 PM, Tjerk Meesters wrote: > > > […] > > Yeah, the problem was that the PR was targeted to master (as you can see > at https://github.com/php/php-src/pull/543), while the RFC targeted 5.6 ( > https://wiki.php.net/rfc/pow-operator#proposed_php_version_s) > Ofc. the person doing the merge could have realized this and either rebase > himself, or ask you to send another PR, but next time make sure that you > base the PR on the correct branch. > Roger that. In case it helps, I've created a branch off PHP-5.6 and cherry picked my commit into it; it can be found here: https://github.com/datibbaw/php-src/compare/php:PHP-5.6...pow-5.6 > > > -- > Ferenc Kovács > @Tyr43l - http://tyrael.hu > -- -- Tjerk