Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:107285 Return-Path: Delivered-To: mailing list internals@lists.php.net Received: (qmail 26125 invoked from network); 22 Sep 2019 14:24:42 -0000 Received: from unknown (HELO php-smtp3.php.net) (208.43.231.12) by pb1.pair.com with SMTP; 22 Sep 2019 14:24:42 -0000 Received: from php-smtp3.php.net (localhost [127.0.0.1]) by php-smtp3.php.net (Postfix) with ESMTP id 8463E2C3CAF for ; Sun, 22 Sep 2019 05:03:02 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on php-smtp3.php.net X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE autolearn=no autolearn_force=no version=3.4.2 X-Spam-ASN: AS8560 212.227.0.0/16 X-Spam-Virus: No Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by php-smtp3.php.net (Postfix) with ESMTPS for ; Sun, 22 Sep 2019 05:03:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1569153779; bh=999w5VAQxcvBJUKJhorfC+YPEZ/frAXeeO97ftNLxfg=; h=X-UI-Sender-Class:Subject:To:Cc:References:From:Date:In-Reply-To; b=Wyb4l9AmQqTxlsoTERvhL7uStY05wpI5XnkstrgVQJMdmKzLq1nd3whTyK2a8fU4h rxecXKYRsnsirvCfxZRAYQ3G4OGt4FLn2brTHg33/voqhuciBXacX2MshLVZoHXATA p/+EbJg+qfhlD/Vk1LdMWQxdwcMpCHNdKkw2oDAg= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [192.168.2.144] ([84.179.236.50]) by mail.gmx.com (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MDysm-1iJg4l11bo-009uFo; Sun, 22 Sep 2019 14:02:59 +0200 To: =?UTF-8?Q?Alexandru_P=c4=83tr=c4=83nescu?= Cc: Nikita Popov , "guilhermeblanco@gmail.com" , PHP internals References: <44818c1e-07e4-19d5-2ef5-144ccb2b5c05@gmx.de> <3628f06b-3c07-6a82-0aee-6a927c21a44d@gmx.de> Message-ID: <8cb2f498-6627-a412-ec65-dea8275c3199@gmx.de> Date: Sun, 22 Sep 2019 14:02:59 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: de-DE Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:JnAtgZazbx+9vrRoKSP9E+rsoW/qM3LCDcdR3UTQAvrDyUs2qkw n3yawZL20N5u5NPgo0ug1PH4V0BvfwTNnNiZzyhxqSs4IorgJbeCAdCIit2gRcGWjxszJF9 +pqW+7rFFPdq4Z/Y0W0jMcvlDeoMA/jb1ax0qE7gQ42VUEwwz69nCJZIYxjMiwuaevS+x0o ETqWbBim6Jx04m65frpPw== X-UI-Out-Filterresults: notjunk:1;V03:K0:5wBIbqr/aQQ=:ubhT24TAK43VHYX6BpKLQc 4kyVI9+c5UB//TQGwYZyUWpS1wJmKs7Eqp5RA8nn45XRvbbvYPuXfnRQFLdvwH+g17sIihraO S6AzSRi9c86jJETo8fwQ+sX05t6R//nBnbVw2xYWt8HQqkBqlFmVo/h80QqTsEXV1Fap16tRv 3voK6HLSeSYt9WDt40wSBq6A80LCy6cZXRVC5AOe6pzylXuyNPoiwwHRuIJ1NzWcBvfpEcJev crKERnG9G5oHmoZldlF+M322ChguMyBN1zSnREgMU8iDDkMOEHt8NvKuczex0ejIMUyaevS4T /YJN/LxaEF8sJCMF5zAPMoM0MGQK8LzzqUXCW97GSNUSCBJXX2Vht/Mjmb1F7F5TTfEhUk0OI xxNR40nK3haHBcGHqiKLPWF5HBKZjR2gq6AQAk/ahz65d+mcWm9uQerUFusnx9lgql/rqFWKf GpsWdo+lQ8FDFxF56I8kzroBiyDe1n3Y9GJxcYd3SunsnBfk2e7vT2uDsvXj4B2dwjJ7RnTGM /zXjw9sKS1ulBM40ef17fZXUZhb5m4MebWuwIvVk0zB7NHj+YpstYhOqWDJ2caRIc9qhJmh0X NZKdYtEYE/MEZeMfjUhwpiIykWGxkSrY1JsQozxlR7zReEzdaApWjVwcpCe65a4Up0BlMPYeq aK/9ZDAvPpwAv95Cf74v7vnX/F7RAedeLzaktVAH7hc+8nd4dpq4rxJBOaF8YwHILr8dg0Dk0 m8Mjey6PejC9W1JtYKYr/3nPyupK/Zfhscc5c2MspBOPC1tBHw1fjAZ4Qoe5FdQPEHcMEGcEd jqoC/4APm/eQdIYm5KvhbkPaVuYVHKXevsNtZbb0SoUp/fMxvW3ksZ4qQGVJC7BeG6mfJtzna tcAT8Brwol/RR+GQX7ANtLysx+hfIDZWJd2EUYEwDt6DuSORlexXoapOZ7TTuzRfQ27sxmmXz uPXU5sDcnM0E97STaLCKzG+mgx4LDrgpEJDSEqN5YCqogZo2HZMmLzcFlAf2+sTYCS3NqbwtR bw0W0v/PJ5XH+mA2GgYTA8989YYZUYzIr7I8a+Yt58ZXXGNyhof4kdQVKuvuKc6BApjxlR/vB +oLYiF9M2rGijL4Q468PXaALH90ex5zHExYGb5hESzelB004Y0KCvXpQpcOUZXF0K6SuqUgSg wa0aFI/H4thhm7SlU1LQ+q/IcAs9uhbuqyidTeOBEqGYBY8GTrCGCQC2lIIhIMk9Dbm8y9i8h 1FyaiCgMvsy8BcGv6xa+svnpgQRYfzM/nZfIqwmwjE1jR6LKHG1y1dv/UoOY= X-Envelope-From: Subject: Re: [PHP-DEV] Re: Question about merged PR #937 From: cmbecker69@gmx.de ("Christoph M. Becker") On 20.09.2019 at 12:59, Alexandru P=C4=83tr=C4=83nescu wrote: > Can you let us know what you used as it's doing the job well :) > CLI git merge or another UI; which one? I'm usually using TortoiseGit, but basically I'm doing git rebase -i HEAD~ > I'm also curious what will happen if there would be two authors on the s= ame > branch/pull request. > Is it interactive or pre-configured to use author of the first commit, l= ast > commit, most of the commits? In this case I likely would not squash commits of different authors. An alternative would be to append the following to the commit message: Co-authored-by: name =2D- Christoph M. Becker