Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:61504
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.216.170 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <CACpmCxLUQ2hVcSiAmx4S1GHB6dr+dUex6WC6x=My470F611Lkw@mail.gmail.com>
References: <CACpmCxLUQ2hVcSiAmx4S1GHB6dr+dUex6WC6x=My470F611Lkw@mail.gmail.com>
Date: Thu, 19 Jul 2012 10:44:57 -0700
Message-ID: <CAKOpQSyA10_8s_Hj2eQYSmZCb9=HDwPNn++Wzstta1GxGDXbZA@mail.gmail.com>
To: Lonny Kapelushnik <lonnyk@gmail.com>
Cc: PHP Internals <internals@lists.php.net>
Content-Type: multipart/alternative; boundary=20cf300fb1bb7fdd6904c53256bf
Subject: Re: [PHP-DEV] PHP Wiki problem
From: kris.craig@gmail.com (Kris Craig)

--20cf300fb1bb7fdd6904c53256bf
Content-Type: text/plain; charset=ISO-8859-1

On Thu, Jul 19, 2012 at 7:35 AM, Lonny Kapelushnik <lonnyk@gmail.com> wrote:

> Hi,
>
> I found a problem in the PHP WIki. On IRC it was suggested that I open a
> bug report (#62611) and email internals.
>
> https://wiki.php.net/vcs/gitworkflow has wrong directions for 'Workflow
> for
> external contributors'.
>
> After `git remote...` you need to call `git fetch upstream` and the
> rebase needs
> to be `git pull --rebase upstream PHP-5.4 (or use upstream master)`.
>
> Have a great day!
>
>
Hmm you're right.  I've applied the changes you requested.  Thanks for
spotting this!  =)

--Kris

--20cf300fb1bb7fdd6904c53256bf--