Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:61488 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 79473 invoked from network); 19 Jul 2012 14:35:11 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 19 Jul 2012 14:35:11 -0000 Authentication-Results: pb1.pair.com smtp.mail=lonnyk@gmail.com; spf=pass; sender-id=pass Authentication-Results: pb1.pair.com header.from=lonnyk@gmail.com; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.216.170 as permitted sender) X-PHP-List-Original-Sender: lonnyk@gmail.com X-Host-Fingerprint: 209.85.216.170 mail-qc0-f170.google.com Received: from [209.85.216.170] ([209.85.216.170:52824] helo=mail-qc0-f170.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id D8/4A-25752-D1B18005 for ; Thu, 19 Jul 2012 10:35:10 -0400 Received: by qcmt36 with SMTP id t36so1928235qcm.29 for ; Thu, 19 Jul 2012 07:35:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=PGS8ccAVPmNKFrL0BYiNC8YgaAlZjHVRYFqYZrk1kTc=; b=GXYdZ98WfcCFKFZ/WsuN6eWX5IExVLYv3F/wyBV4PKnuoJ7bTj121l9b8BLaz78sn4 HDflk3h6Ta8dM2uyku+KT7pfzNSBrNpZosJ5A9O+UxYDPi4JIEVs1LpNio5LD14esxJj Ff/5cTjvhYVAXHnm8Z038/pHn9AY+Yh08PqouQ9NURFWjT8BTV2eW9oY7CQxMtOHUfvd k488idohsXzmqo5TyLzi0iCCzZzDvk0cvUx5cwct01F5rnIuybd2pI6i8jCRwLU9jArU G1zYYzxjrfUSYT/s8BOlMvB+vWoSYYiz+2+90MGu4LwajZM91cjivZgpR0x1T3rHZn91 U7Sg== MIME-Version: 1.0 Received: by 10.182.152.97 with SMTP id ux1mr3154221obb.13.1342708505959; Thu, 19 Jul 2012 07:35:05 -0700 (PDT) Received: by 10.182.69.169 with HTTP; Thu, 19 Jul 2012 07:35:05 -0700 (PDT) Date: Thu, 19 Jul 2012 10:35:05 -0400 Message-ID: To: PHP Internals Content-Type: multipart/alternative; boundary=f46d04462c0a88dce704c52fafeb Subject: PHP Wiki problem From: lonnyk@gmail.com (Lonny Kapelushnik) --f46d04462c0a88dce704c52fafeb Content-Type: text/plain; charset=ISO-8859-1 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! -- Lonny Kapelushnik http://lonnylot.com (732) 807-5509 --f46d04462c0a88dce704c52fafeb--