Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:107265 Return-Path: Delivered-To: mailing list internals@lists.php.net Received: (qmail 24420 invoked from network); 20 Sep 2019 13:21:57 -0000 Received: from unknown (HELO php-smtp3.php.net) (208.43.231.12) by pb1.pair.com with SMTP; 20 Sep 2019 13:21:57 -0000 Received: from php-smtp3.php.net (localhost [127.0.0.1]) by php-smtp3.php.net (Postfix) with ESMTP id 4805B2D203F for ; Fri, 20 Sep 2019 03:59:49 -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.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,HTML_MESSAGE,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=no autolearn_force=no version=3.4.2 X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Virus: No Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) (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 ; Fri, 20 Sep 2019 03:59:48 -0700 (PDT) Received: by mail-io1-xd2a.google.com with SMTP id m11so15252970ioo.0 for ; Fri, 20 Sep 2019 03:59:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=wGYGZpnTpeKuhjAeTZOZKQHGlEwEgBETYls97rx3+YE=; b=ZrmEedYtHSLVqhhWyGrPQhSzy2qIUxRvAnSTNNcmNF7RumX089GYAZV6GjLGzbK7cN aw3BbSVKY2y3itarf8kpWX7K+E7dO5MXPAhsn7qX2o75EQURcbSjE9FQmSYlo6tBDeFW l6gOvrUUvVdctS/BuUYHjYJFH2qLjMptdkgk/2c+NxdtH6WnCvYd5Gum4EYBE6I3GQ/N jNpqLBxFRgmXy7bC2NSnXsfNpDTx34p6Drb236P5p64KuJWDCiWD7cQ0kGlcjGt2jH8N 4SDODaH47TxOmWTg5kAe1QzmxglT5iT99a9cwXuxzQ74FDEXedBEd839vNboXRwXPYeE 0s0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=wGYGZpnTpeKuhjAeTZOZKQHGlEwEgBETYls97rx3+YE=; b=YfW1MvHZuR1qEjRt24xFRauprzzzMDYhBTc/Yn52pJrIO8Z5kYywbPvOKfy8eT9Ig3 sThwrdogu/Q62IKVjSp9zoyEczussUL4Ujn6PcVTa95NBfQB24yJSy8oDg3dzIatvfeo WoXWugbrD0bqD+wfkkMDjrtPdSLEt5clrZEJNDjyDiQNxBQH/2330PgQbxjHO9DHCI/S 1paiLsw9k0A4brvFYyoZ3Chjlq/6/hkCE88nAmIMYWR2Kos6x63laLdMUWWLDBURf+3r EOwHdJspQxRVuxf/e2HM+L2JqaZjIXTvL4cChyInpBboh4OX+WtuaxD2F6xDOn296jrb HoXA== X-Gm-Message-State: APjAAAUzGjw0ZxPtDaQBHQf1ao+Zd8YxU2Zkj1OWrUdXCH47YKdZTimW qx9gTT4qSaP15BllYmP1SKDgjwfvO9NFAcDkLFw= X-Google-Smtp-Source: APXvYqywfwcYnGI2fzHil0bkPnmJfDUrn4WBMxjkYvq2lSZ6HWXuhN54uV2/5eligChKWmD9mWEUNM620QhwR8/609M= X-Received: by 2002:a5e:851a:: with SMTP id i26mr18385037ioj.304.1568977187942; Fri, 20 Sep 2019 03:59:47 -0700 (PDT) MIME-Version: 1.0 References: <44818c1e-07e4-19d5-2ef5-144ccb2b5c05@gmx.de> <3628f06b-3c07-6a82-0aee-6a927c21a44d@gmx.de> In-Reply-To: <3628f06b-3c07-6a82-0aee-6a927c21a44d@gmx.de> Date: Fri, 20 Sep 2019 13:59:20 +0300 Message-ID: To: "Christoph M. Becker" Cc: Nikita Popov , "guilhermeblanco@gmail.com" , PHP internals Content-Type: multipart/alternative; boundary="000000000000f2b8d00592f9f7e6" X-Envelope-From: Subject: Re: [PHP-DEV] Re: Question about merged PR #937 From: drealecs@gmail.com (=?UTF-8?Q?Alexandru_P=C4=83tr=C4=83nescu?=) --000000000000f2b8d00592f9f7e6 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 also curious what will happen if there would be two authors on the same branch/pull request. Is it interactive or pre-configured to use author of the first commit, last commit, most of the commits? On Fri, Sep 20, 2019 at 1:40 PM Christoph M. Becker wrote: > On 20.09.2019 at 12:35, Alexandru P=C4=83tr=C4=83nescu wrote: > > > Was this squash done during merging of a github pull request? > > Yes, it was when applying . I > didn't use the Github UI, though. > > -- > Christoph M. Becker > --000000000000f2b8d00592f9f7e6--