Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:113872
Return-Path: <php@golemon.com>
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 7194 invoked from network); 30 Mar 2021 16:53:57 -0000
Received: from unknown (HELO php-smtp4.php.net) (45.112.84.5)
by pb1.pair.com with SMTP; 30 Mar 2021 16:53:57 -0000
Received: from php-smtp4.php.net (localhost [127.0.0.1])
by php-smtp4.php.net (Postfix) with ESMTP id 15D941804D8
for <internals@lists.php.net>; Tue, 30 Mar 2021 09:51:16 -0700 (PDT)
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on php-smtp4.php.net
X-Spam-Level: *
X-Spam-Status: No, score=1.4 required=5.0 tests=BAYES_00,
HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,
RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_SOFTFAIL autolearn=no
autolearn_force=no version=3.4.2
X-Spam-Virus: No
X-Envelope-From: <php@golemon.com>
Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by php-smtp4.php.net (Postfix) with ESMTPS
for <internals@lists.php.net>; Tue, 30 Mar 2021 09:51:15 -0700 (PDT)
Received: by mail-lf1-f43.google.com with SMTP id o10so24765698lfb.9
for <internals@lists.php.net>; Tue, 30 Mar 2021 09:51:15 -0700 (PDT)
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=x3Mla0ChlYAKfz5+hyKY+Iwk3tO2Upo+C86hYqUP560=;
b=uRWl10Lf1igfTHwwyuCvkDtNfLVfzOkByDCOPXyGLphcoy/VWTMVZyIlQNGz/jRCwk
uw7qnr/oN2n3xj2QUDsgS8+oQZ8eTQD9bAL46AnIL8BRXx8A3DFXI1Qs7mkxQ/5cFrvr
OjcaAZRLFVKSQJs8osE9ehmlwi2CdfYNS3vGGJiU1z7rmHamNbiLygaXnyCBvAYEnDZB
+bpH89UbwWjVQN5CawQ7HO1VNYHoNAYeZeLsMmgbyu1F1k3tAS6XdurtwDYKffvL8ULM
J/w1q/wJXN8XSMs659y9TDj4kyF9iaYTtBfW5sU4U0+EgyUXNBkECPA0UGECEhF6dNbY
lgGw==
X-Gm-Message-State: AOAM530yoCosemPUqnuA6ayfAVv8qLLniLXJQxB9dK58yODqjA6SXHXe
7nkbs3qJjn5nDYSAnEA+Bi0NLiz5xr5n+6M0jm6uEw==
X-Google-Smtp-Source: ABdhPJyq7LyZRvIb8BghiXvVSJQdi68xx7Esy53epxgWwhXN8rUCzfsklsQfirrSyATNbbSiHiKpZDkExKpLukoPFrA=
X-Received: by 2002:ac2:5509:: with SMTP id j9mr20075648lfk.302.1617123071955;
Tue, 30 Mar 2021 09:51:11 -0700 (PDT)
MIME-Version: 1.0
References: <CAF+90c9A6zG-nYzc3NNtWGjN7y5FmwqnYzjq6GSFC5NtRsOT0w@mail.gmail.com>
<CAGgaK7JywM+aU4YTK3tUr3xjN5746LDoda4SC_=A+msGdWhNyg@mail.gmail.com>
<6c3d7c13-d7cd-c1cc-5876-2b8c200a017c@gmail.com> <CAGgaK7JxmLexnkrt+kLfV47wi=KoeqhnzGjTyrcAQtxemKoSKQ@mail.gmail.com>
<E344AED6-17BA-4FC9-9173-17F524C40766@php.net> <A7687BC9-9457-4E54-93CC-289F95F30EF6@newclarity.net>
<CAEKnhAGgrX9467Rku98cLyC9CM+cwGwWd3dtaQvS_jjebH1dmA@mail.gmail.com>
<CAEKnhAENADeVQTyWASi-i7eoXa7iZ6Uo-bo+omNDgF3Wnb8TLQ@mail.gmail.com>
<D12AAFF7-B16E-4535-86D2-0FC6D957CDBA@newclarity.net> <CAESVnVrG56d86d0akuYPvQeH-7DHBuofEWC5gJSdXCwe07BbGg@mail.gmail.com>
<47b6019d-f520-1975-6332-08a9327a1633@gmx.de>
In-Reply-To: <47b6019d-f520-1975-6332-08a9327a1633@gmx.de>
Date: Tue, 30 Mar 2021 11:51:01 -0500
Message-ID: <CAESVnVrZGP+nTSCu-JzkO=Ao0-FhWXwC3Ztq6XnZiWb9ELSWxw@mail.gmail.com>
To: "Christoph M. Becker" <cmbecker69@gmx.de>
Cc: Mike Schinkel <mike@newclarity.net>, Jakub Zelenka <bukka@php.net>,
PHP Internals <internals@lists.php.net>
Content-Type: multipart/alternative; boundary="0000000000004322e305bec3ce56"
Subject: Re: [PHP-DEV] Changes to Git commit workflow
From: pollita@php.net (Sara Golemon)
--0000000000004322e305bec3ce56
Content-Type: text/plain; charset="UTF-8"
On Tue, Mar 30, 2021 at 10:13 AM Christoph M. Becker <cmbecker69@gmx.de>
wrote:
> > https://github.com/php/php-src/blob/master/NEWS which is a guaranteed
> merge
> > conflict between branches.
>
> Nope, see <https://wiki.php.net/vcs/gitworkflow#initial_setup>. :)
>
>
GAME. CHANGED.
This message constitutes your EFT (Entirely Fungible Token) for a beer if I
even meet you in person.
-Sara
--0000000000004322e305bec3ce56--