Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:86331 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 29619 invoked from network); 21 May 2015 07:16:39 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 21 May 2015 07:16:39 -0000 Authentication-Results: pb1.pair.com smtp.mail=remi@fedoraproject.org; spf=permerror; sender-id=unknown Authentication-Results: pb1.pair.com header.from=remi@fedoraproject.org; sender-id=unknown Received-SPF: error (pb1.pair.com: domain fedoraproject.org from 217.70.183.198 cause and error) X-PHP-List-Original-Sender: remi@fedoraproject.org X-Host-Fingerprint: 217.70.183.198 relay6-d.mail.gandi.net Received: from [217.70.183.198] ([217.70.183.198:34903] helo=relay6-d.mail.gandi.net) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 1D/D0-20801-5568D555 for ; Thu, 21 May 2015 03:16:38 -0400 Received: from mfilter3-d.gandi.net (mfilter3-d.gandi.net [217.70.178.133]) by relay6-d.mail.gandi.net (Postfix) with ESMTP id EB1A8FB87E for ; Thu, 21 May 2015 09:16:34 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter3-d.gandi.net Received: from relay6-d.mail.gandi.net ([217.70.183.198]) by mfilter3-d.gandi.net (mfilter3-d.gandi.net [10.0.15.180]) (amavisd-new, port 10024) with ESMTP id BAjcQHSwgxxC for ; Thu, 21 May 2015 09:16:33 +0200 (CEST) X-Originating-IP: 82.241.130.121 Received: from schrodingerscat.famillecollet.com (pom51-2-82-241-130-121.fbx.proxad.net [82.241.130.121]) (Authenticated sender: contact@ll-experts.com) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 5A9D3FB8D4 for ; Thu, 21 May 2015 09:16:32 +0200 (CEST) Message-ID: <555D864F.10808@fedoraproject.org> Date: Thu, 21 May 2015 09:16:31 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: internals@lists.php.net Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: About merging Pull Request workflow From: remi@fedoraproject.org (Remi Collet) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Current workflow described in https://wiki.php.net/vcs/gitworkflow#merge_a_pull_request Problem, git history only give info about a "merge" Ex, after merging 1278: http://git.php.net/?p=php-src.git;a=commit;h=eef762d576e7744d6e0c8d6a3f997fe911b2dc34 Another simple workflow could be 1/ Download the patch https://github.com/php/php-src/pull/1278.patch 2/ apply it git am 1278.patch 3/ close the PR from https://qa.php.net/pulls This preserve credits to the authors and give a better history. What do you think ? Remi -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlVdhk8ACgkQYUppBSnxahhKuACfbXzDxPsZJTyfwLtyoTALPVhs dbUAn2kk9vlD//ZQvea5Me1KU2JMgjdQ =1Xi5 -----END PGP SIGNATURE-----