Re: Changes to Git commit workflow

From: Date: Tue, 30 Mar 2021 15:13:19 +0000
Subject: Re: Changes to Git commit workflow
References: 1 2 3 4 5 6 7 8 9 10  Groups: php.internals 
Request: Send a blank email to internals+get-113870@lists.php.net to get a copy of this message 
On 30.03.2021 at 15:50, Sara Golemon wrote:

> 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.

Nope, see <https://wiki.php.net/vcs/gitworkflow#initial_setup>.
:)

--
Christoph M. Becker

Thread (45 messages)

« previous php.internals (#113870) next »