1. Messages
  2. Proposal to Rename the Primary Branch on all Cloud Foundry repos

Re: Proposal to Rename the Primary Branch on all Cloud Foundry repos

Jan Dubois <JDubois@...>
 

I too agree with Jesse that in repos where you have `master` and `develop` branches, renaming `master` to `release` is more clear than using `main`.

For repos that have just a single trunk branch I have a slight personal preference for `latest`, as it mirrors the tag typically used to identify the latest build of a container image.

`main` also still has a connotation of being superior to the others (additional/auxiliary/supplemental/subordinate/???), which `latest` doesn't, imho.

"I've tested against the `latest` branch, and the issue is still reproducible" sounds descriptive to me.

Just using `develop` as the only branch could work too. E.g. UAA only uses `develop` and hasn't pushed to `master` since 2018, so you could just delete their `master` and nobody would notice... :)

Cheers,
-Jan

On Jun 24, 2020, at 11:33 AM, Caroline Taymor via lists.cloudfoundry.org <taymorc=vmware.com@...> wrote:

I agree with Jesse. Renaming from `master` is a great idea which I strongly support. `main` is similar but more inclusive, but perhaps we can take the opportunity to increase the semantic meaning of the branch names.
Caroline
 
From: <cf-dev@...> on behalf of Jesse Alford <jalford@...>
Reply-To: "cf-dev@..." <cf-dev@...>
Date: Wednesday, June 24, 2020 at 11:11 AM
To: "Discussions about Cloud Foundry projects and the system overall." <cf-dev@...>
Subject: Re: [cf-dev] Proposal to Rename the Primary Branch on all Cloud Foundry repos
 
Could we consider using `develop` (and/or, where appropriate, `release` and version-specific branches) instead?
 
In addition to being problematic, `master` is confusing, as it means different things in different processes.
 
`develop`/`release` makes it clear what branch you're supposed to push/merge to.
 
As an example, `cf-deployment` currently has `develop` and `master`, with `master` being effectively a release branch - all releases are ff-only merges tagged on `master` with a version number. `main` would be less clear than `release` in this case - and, I suspect, in many others.
From: cf-dev@... <cf-dev@...> on behalf of Lee Porte via lists.cloudfoundry.org <lee.porte=digital.cabinet-office.gov.uk@...>
Sent: Wednesday, June 24, 2020 12:22 AM
To: Discussions about Cloud Foundry projects and the system overall. <cf-dev@...>
Subject: Re: [cf-dev] Proposal to Rename the Primary Branch on all Cloud Foundry repos
 
Hi all, 
 
I am also in support of this change after enquiring on slack.
 
Cheers
 
L
 
On Tue, 23 Jun 2020 at 23:06, Dieu Cao <dieuc@...> wrote:
Hey all,
I would like to propose that the cloud foundry projects rename the primary branch on allhttps://github.com/cloudfoundry and https://github.com/cloudfoundry-incubator repos to “main” as part of Cloud Foundry’s commitment to an inclusive and welcoming community.
I believe some project teams independently have plans to invest in making this change.
Thoughts? Feedback?
-Dieu

 
-- 
Lee Porte
Reliability Engineer 
GOV.UK PaaS Team
‪020 3920 6036
07785 449292
Join {cf-dev@lists.cloudfoundry.org to automatically receive all group messages.