You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by Violeta Georgieva <vi...@apache.org> on 2020/07/22 03:56:26 UTC

Re: Changing the name of the default branch in our git repos

На пт, 26.06.2020 г. в 23:41 Rémy Maucherat <re...@apache.org> написа:
>
> On Fri, Jun 26, 2020 at 4:48 PM Mark Thomas <ma...@apache.org> wrote:
>>
>> Hi,
>>
>> Picking up this thread again I see a range of views. "main" seems to be
>> the most popular although several folks suggested "10.0.x" and "use
>> whatever GitHub use". There was also interest in "trunk". Particularly
>> with the additional suggestion of "10.0.x" appearing in the middle of
>> the discussion, I'm not sure where consensus lies at the moment.
>
>
> I was used to trunk :)

It seems GitHub has some plans for the renaming
https://github.com/github/renaming

Violeta

>
> Rémy
>
>>
>>
>> One suggestion I particularly liked was to do the rename at the point we
>> branch 10.0.x and start on 10.1.x since we will need to be updating CI
>> and various things anyway. That is currently looking like September as
>> that is the target date for the Jakarta EE 9 release.
>>
>> I suspect that this could get tricky as I'd prefer "main" or "10.0.x",
>> could work with "trunk" but really don't want to continue with "master".
>> I imagine others have similar views in different combinations. Maybe if
>> others express their views in a similar way to the above we'll end up
>> with a natural consensus. If not, we'll have to figure something out.
>>
>> Mark
>>
>>
>>
>> On 19/06/2020 16:32, Emmanuel Bourg wrote:
>> > Le 16/06/2020 à 10:02, Mark Thomas a écrit :
>> >
>> >> Thoughts?
>> >
>> > I'd prefer the status-quo and keep "master", I've always understood
this
>> > as the 'master record' (I know it might be historically wrong) and I
>> > haven't seen evidences it has ever offended or deterred anyone from
>> > contributing.
>> >
>> > If there is a consensus to change I suggest waiting to see what GitHub
>> > plans to do. The "master" name is a de-facto standard for Git
>> > repositories, and I think we should remain consistent with the new name
>> > that will be popularized by GitHub.
>> >
>> > That said, I have a preference for "main".
>> >
>> > Emmanuel Bourg
>> >
>> > ---------------------------------------------------------------------
>> > To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> > For additional commands, e-mail: dev-help@tomcat.apache.org
>> >
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org