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

Update default branch to main #1798

Closed
domgreen opened this issue Sep 7, 2020 · 5 comments
Closed

Update default branch to main #1798

domgreen opened this issue Sep 7, 2020 · 5 comments
Labels
area/meta Organisational matters. e.g. Governance, release cycles, etc. kind/cleanup Refactoring code, fixing up documentation, etc kind/feature New features for Agones
Milestone

Comments

@domgreen
Copy link
Contributor

domgreen commented Sep 7, 2020

Is your feature request related to a problem? Please describe.
Industry is moving away from terms such as master, slave, blacklist, whitelist as they have negative connotations. Many other open source projects are moving to main where possible.

Having done this internally projects on GitHub that I have migrated work fine with merging, branching and typical workflows.

Describe the solution you'd like
Update default branch to main and ensure any unseen automation continues to work.

Describe alternatives you've considered

  • Could choose another default branch name if main doesnt work eg. default.
  • Keep using master (not desirable)

Additional context

@domgreen domgreen added the kind/feature New features for Agones label Sep 7, 2020
@markmandel
Copy link
Member

100% in support of this.

Personally, was waiting for: https://github.com/github/renaming#later-this-year-seamless-move-for-existing-repositories- just to make things easier for everyone and not break existing tooling.

@markmandel markmandel added area/meta Organisational matters. e.g. Governance, release cycles, etc. kind/cleanup Refactoring code, fixing up documentation, etc labels Sep 8, 2020
@domgreen
Copy link
Contributor Author

domgreen commented Sep 8, 2020

That's great to hear 👍

@markmandel
Copy link
Member

Thanks for writing the ticket, so we don't forget 👍

@markmandel
Copy link
Member

https://github.blog/changelog/2021-01-19-support-for-renaming-an-existing-branch/

Tooling now exists 👍🏻

I'd recommend that we make the change right after the next stable release, just in case anything breaks and we need to fix it, it will give us plenty of time.

@markmandel markmandel pinned this issue Feb 2, 2021
@markmandel
Copy link
Member

This has been done!

git branch -m master main
git fetch origin
git branch -u origin/main main

or if you use upstream to point at the main repo

git branch -m master main
git fetch upstream
git branch -u upstream/main main

@markmandel markmandel added this to the 1.13.0 milestone Feb 4, 2021
@markmandel markmandel unpinned this issue Feb 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/meta Organisational matters. e.g. Governance, release cycles, etc. kind/cleanup Refactoring code, fixing up documentation, etc kind/feature New features for Agones
Projects
None yet
Development

No branches or pull requests

2 participants