Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename branch "master" to "main" #171

Closed
ameowlia opened this issue Jun 30, 2020 · 2 comments
Closed

Rename branch "master" to "main" #171

ameowlia opened this issue Jun 30, 2020 · 2 comments
Labels
scheduled We agree this change makes sense and plan to work on it ourselves at some point.

Comments

@ameowlia
Copy link
Member

Current State

We have 3 non-wip branches that we use for routing-release.

branch name purpose
develop Where we push code we are actively developing. When people submit PRs, they submit them against the develop branch.
release-candidate Once the code on develop passes our pipeline, it is merged into this branch automatically.
master When we release, we merge release-candidate into the master branch.

Desired State

  • Replace "master" with "main"

Why does this matter?

Master/slave terminology has existed for decades and has permeated many aspects of computer science and other fields. It is also extremely racist. We should stop using these terms.

There has been some debate on the cf-dev mailing list about whether teams should replace "master" with "main" or with some other term. I think we should chose "main" because that is what github changing its default to. By choosing the same default branch name as github this will provide predictability and cohesion between repos.
@mcwumbly
Copy link
Contributor

I'm in favor of "main" if we believe that it'll be more consistent with other repos.

If consistency seems unattainable, then I'd vote for "release", given the table you helpfully put together above. Let's include that table (with the new name) in https://github.com/cloudfoundry/routing-release#developer-workflow and/or in a new CONTRIBUTING.md while we're at it!

@jenspinney jenspinney added the scheduled We agree this change makes sense and plan to work on it ourselves at some point. label Jul 1, 2020
@kauana
Copy link

kauana commented Jul 17, 2020

Done! We renamed the master branch to release: 9f9f04b

@kauana kauana closed this as completed Jul 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
scheduled We agree this change makes sense and plan to work on it ourselves at some point.
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
4 participants
@mcwumbly @jenspinney @ameowlia @kauana