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

rename master branch to main #2259

Closed
jordandsullivan opened this issue Apr 2, 2024 · 9 comments · Fixed by #2263
Closed

rename master branch to main #2259

jordandsullivan opened this issue Apr 2, 2024 · 9 comments · Fixed by #2263
Assignees
Labels
non-quantum Requires no knowledge of quantum physics to fix / work on. tech debt Technical Debt that should be paid off!

Comments

@jordandsullivan
Copy link
Contributor

To be more in line with default naming for primary branches in the industry: https://github.com/github/renaming

I think since github will redirect master links to main (according to https://github.com/github/renaming?tab=readme-ov-file#whats-already-changed), the best thing to do is

  1. Change the name of master to main via this GUI:
    image
    Changing the name may still break CI/CD, but it should be fixed after step 3.

  2. Create a branch where we'll replace all the instances of "master" with "main" in our documentation, tutorials, and actions.

  3. Merge this branch into the newly named main branch

@jordandsullivan jordandsullivan added tech debt Technical Debt that should be paid off! non-quantum Requires no knowledge of quantum physics to fix / work on. labels Apr 2, 2024
@jordandsullivan jordandsullivan self-assigned this Apr 2, 2024
@jordandsullivan
Copy link
Contributor Author

@natestemen @FarLab @purva-thakre Happy with this plan?

@natestemen
Copy link
Member

LGTM! I'd just add that I think step 2 should come first, and then just before merging said PR, step 1 should be taken followed by 3. Then, there could be a step 4 as well. Something like

  1. Send message in #mitiq channel describing how to change the name of the local master branch to main.

This should help prevent things from getting into a bad state by starting the process, and not finishing it in one fell swoop.

@jordandsullivan
Copy link
Contributor Author

jordandsullivan commented Apr 2, 2024

Okey doke. Sounds good. So the final plan would be

  • 1. Create a branch (rename master branch to main #2259) where we'll replace all the instances of "master" with "main" in our documentation, tutorials, and actions.

  • 2a. Change the name of master to main via the GitHub GUI

  • 2b. Add "changed name of master branch to main" to changelog

  • 3. Merge rename master branch to main #2259 into the newly named main branch

  • 4. Send message in #mitiq channel in Discord describing how to change the name of the local master branch to main.

@jordandsullivan
Copy link
Contributor Author

Do we want to leave the existing changelog saying "master" since that's what it was called when past changes were made?

@natestemen
Copy link
Member

I think it's probably best to use main going forward, but not to change it in the changelog for things prior to this change. I can see reasons for both decisions, but I lean this way. Do you have a preference?

@jordandsullivan
Copy link
Contributor Author

jordandsullivan commented Apr 2, 2024 via email

@jordandsullivan jordandsullivan linked a pull request Apr 3, 2024 that will close this issue
6 tasks
@jordandsullivan
Copy link
Contributor Author

I'm not quite sure a good way to update the changelog to say we've made this change since it isn't a release. Any suggestions for format?

@cosenal
Copy link
Contributor

cosenal commented Apr 3, 2024

I'm not quite sure a good way to update the changelog to say we've made this change since it isn't a release. Any suggestions for format?

Since you have a PR with that, isn't it going to show up automatically in the changelog?

@natestemen
Copy link
Member

Yup this will get populated in the changelog when the next release is done!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
non-quantum Requires no knowledge of quantum physics to fix / work on. tech debt Technical Debt that should be paid off!
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants