Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:59146 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 20600 invoked from network); 24 Mar 2012 13:23:19 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 24 Mar 2012 13:23:19 -0000 X-Host-Fingerprint: 217.114.211.68 unknown Date: Sat, 24 Mar 2012 08:23:18 -0500 Received: from [217.114.211.68] ([217.114.211.68:21609] helo=localhost.localdomain) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 7F/C0-18105-6CACD6F4 for ; Sat, 24 Mar 2012 08:23:18 -0500 To: internals@lists.php.net References: <4F6BB4AA.2090208@oracle.com> <4F6BC462.6060001@oracle.com> User-Agent: slrn/0.9.9p1 (SunOS) Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: X-Posted-By: 217.114.211.68 Subject: Re: [PHP-DEV] Git merging fun and a local clone-per branch workflow From: dsp@php.net (David Soria Parra) On 2012-03-24, Alexey Shein wrote: > Hello, > > Just wanted to say that I updated multiple working dirs scenario here > https://gist.github.com/2165086/, which is *much* more simplified now, > thanks to dsp for hint about git-new-workdir script. > It should work fine if all changes from downstream branches (such as > PHP-5.3) are always merged into upstream (PHP-5.4). > If it's not the case, then some other solution is needed. Can you pleae add a description like that to the php wiki ?