Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:113867
Message-ID: <91F57903-6280-4F0C-903E-A9B1401F0A25@newclarity.net>
Content-Type: multipart/alternative;
	boundary="Apple-Mail=_A3F2DE05-392B-4053-894B-82234A234890"
Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\))
Date: Tue, 30 Mar 2021 10:08:26 -0400
In-Reply-To: <CAESVnVrG56d86d0akuYPvQeH-7DHBuofEWC5gJSdXCwe07BbGg@mail.gmail.com>
Cc: PHP Internals <internals@lists.php.net>
To: Sara Golemon <pollita@php.net>
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>
Subject: Re: [PHP-DEV] Changes to Git commit workflow
From: mike@newclarity.net (Mike Schinkel)

--Apple-Mail=_A3F2DE05-392B-4053-894B-82234A234890
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=utf-8

> On Mar 30, 2021, at 9:50 AM, Sara Golemon <pollita@php.net> wrote:
>=20
> On Tue, Mar 30, 2021 at 8:34 AM Mike Schinkel <mike@newclarity.net =
<mailto: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> =
<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 =
<https://github.com/php/php-src/blob/master/NEWS> which is a guaranteed =
merge conflict between branches.
>=20
> There are a few other places that mostly impact RMs like =
main/php_version.h and configure.ac <http://configure.ac/>
Gotcha. Thanks for the details on that Sara and George.

Is there any chance the team would consider modifying the workflow a =
bit?  I only ask if my input is helpful. If not, please disregard.

When teams I have been on in the past have found frequent merge =
conflicts we've restructured to move the frequently conflicting items to =
their own repo.

Then the high-conflict repo gets its own set of workflow rules and we =
used CI/CD and more recently GitHub Actions to incorporate the =
"releases" from the high-conflict repo into the main low-conflict repo.

Given those files you mentioned they seems to be about release =
management =E2=80=94 and maybe harder for someone to inject a back-door =
into =E2=80=94 so maybe a "release management" repo that gets merged in =
to php-src with GitHub Actions at appropriate times?

Again, please feel free to tell me to butt out if my thoughts are not =
being helpful here.

-Mike=

--Apple-Mail=_A3F2DE05-392B-4053-894B-82234A234890--