Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:113865
Return-Path: <php@golemon.com>
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 79695 invoked from network); 30 Mar 2021 13:53:28 -0000
Received: from unknown (HELO php-smtp4.php.net) (45.112.84.5)
  by pb1.pair.com with SMTP; 30 Mar 2021 13:53:28 -0000
Received: from php-smtp4.php.net (localhost [127.0.0.1])
	by php-smtp4.php.net (Postfix) with ESMTP id 539B41804E4
	for <internals@lists.php.net>; Tue, 30 Mar 2021 06:50:41 -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-f53.google.com (mail-lf1-f53.google.com [209.85.167.53])
	(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 06:50:40 -0700 (PDT)
Received: by mail-lf1-f53.google.com with SMTP id o10so23860035lfb.9
        for <internals@lists.php.net>; Tue, 30 Mar 2021 06:50:40 -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=5V9Few6GJ3Tr9xn7GXHdI4BVPxJBGk+PfQ6fgUJtDg8=;
        b=TLACPo0wEa3VpdOBnqcWfPa83VTDNLD9t5yRHITf7xOrTCsAG2FYj4f5bO2i9OS1c+
         46u5PBcOvdHhOTv0DrNAiS9+lHQ8RNfJeMnfH8DLunp8iWS8zDq08CPTR5lyevp/npAE
         n7wyrkix4cW0LnxuyitZ1RQVeR+mCXFScMRDifYljzqqNUdi697PUZagwhe4VbIylfft
         fFs4OMBAuWMQPvv8KDYM8Xpmc9tSjUqvBQOmCAMV/Lq39/SBVuhpM8p4aUotRu3ojcgU
         QODt6WoBoHd+rEFDStkpMZpM74I8+P1ehTjfTTwF44eYzjMvf3/yFJrxcPZKSbbfN9TS
         NXXA==
X-Gm-Message-State: AOAM5333ZnLVJ4WJBmUxdLZYTMsNoXuKv5qG6O4OV4B7fjj1b9uvzU2v
	rPnrNi3q1jwqlv8NN7UyexmWJJVeqpFaEMmK7uFMtw==
X-Google-Smtp-Source: ABdhPJztIWxv1Ddqg97nI4x13ihvfZhN8tsRrAZuZ+2skgjIdl2PcNk+5UaDS/oiQ8hpXaVZ19/vE9Cd/sQWzmcv29U=
X-Received: by 2002:a05:6512:22d2:: with SMTP id g18mr12242245lfu.572.1617112237762;
 Tue, 30 Mar 2021 06:50:37 -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>
In-Reply-To: <D12AAFF7-B16E-4535-86D2-0FC6D957CDBA@newclarity.net>
Date: Tue, 30 Mar 2021 08:50:27 -0500
Message-ID: <CAESVnVrG56d86d0akuYPvQeH-7DHBuofEWC5gJSdXCwe07BbGg@mail.gmail.com>
To: Mike Schinkel <mike@newclarity.net>
Cc: Jakub Zelenka <bukka@php.net>, PHP Internals <internals@lists.php.net>
Content-Type: multipart/alternative; boundary="0000000000007e7b2205bec1485b"
Subject: Re: [PHP-DEV] Changes to Git commit workflow
From: pollita@php.net (Sara Golemon)

--0000000000007e7b2205bec1485b
Content-Type: text/plain; charset="UTF-8"

On Tue, Mar 30, 2021 at 8:34 AM Mike Schinkel <mike@newclarity.net> wrote:
> When you speak of NEWS, do you mean this?
> https://github.com/php/web-news <https://github.com/php/web-news>
>
Negative. NEWS in all caps invariably refers to
https://github.com/php/php-src/blob/master/NEWS which is a guaranteed merge
conflict between branches.

There are a few other places that mostly impact RMs like main/php_version.h
and configure.ac

-Sara

--0000000000007e7b2205bec1485b--