> On Mar 30, 2021, at 9:50 AM, Sara Golemon <pollita@php.net> wrote:
>
> 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.
>
> 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 — and maybe harder for
someone to inject a back-door into — 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