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 #2799

Closed
delvedor opened this issue Jan 16, 2021 · 15 comments
Closed

Rename master branch to main #2799

delvedor opened this issue Jan 16, 2021 · 15 comments
Labels
chore Small changes or internal project maintenance

Comments

@delvedor
Copy link
Member

As titled.
It should not be a problem here, but the documentation build should be updated.

Related: https://github.com/github/renaming

/cc @lmammino

@delvedor delvedor added the chore Small changes or internal project maintenance label Jan 16, 2021
@mcollina
Copy link
Member

Go for it!

@jsumners
Copy link
Member

This is just a solution in search of a problem. And implementing it is going to cause problems for everyone who has the code forked.

@delvedor
Copy link
Member Author

@jsumners I don't agree, if you are maintaining a fork for a pr changing the base branch is the same as changing it when targeting the wrong branch or when we switch from next to master.
Once we do this, we'll ping the authors of every open pr (again, like we did when we switched from next to master) to let them know that they need to rebase on a new branch (with zero breaking changes in this case).

@mcollina
Copy link
Member

The tooling provided by github is going to do all the rebasing automatically, it would also allow the old references to continue working. We can also wait for Node.js core to switch for example and validate the approach.

@zekth
Copy link
Member

zekth commented Jan 16, 2021

Those references need to be changed:
https://github.com/fastify/fastify/blob/master/.github/workflows/website.yml#L6
https://github.com/fastify/fastify/blob/master/.github/workflows/package-manager-ci.yml#L6

@zekth
Copy link
Member

zekth commented Jan 16, 2021

Once we do this, we'll ping the authors of every open pr (again, like we did when we switched from next to master) to let them know that they need to rebase on a new branch (with zero breaking changes in this case).

Renaming a branch will:
Re-target any open pull requests

Not even sure it is necessary

@delvedor
Copy link
Member Author

@veritem
Copy link
Contributor

veritem commented Mar 7, 2021

May I go for this one

@veritem veritem mentioned this issue Mar 7, 2021
4 tasks
@Eomm
Copy link
Member

Eomm commented Mar 7, 2021

Yes, of course

I would suggest this roadmap:

This worked well

*to update the local references:

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

@mcollina
Copy link
Member

mcollina commented Mar 7, 2021

The website integration would need to be fixed.

@mcollina
Copy link
Member

This was done

@10xLaCroixDrinker
Copy link
Contributor

10xLaCroixDrinker commented Mar 9, 2024

Any plans to do this for any of the 93 remaining fastify repos that use a master branch?

@mcollina
Copy link
Member

mcollina commented Mar 9, 2024

@10xLaCroixDrinker possibly, but it really depends on admins time. There are no tools to massively change github settings inside and org.

@10xLaCroixDrinker
Copy link
Contributor

@mcollina would PRs to update references to master within those repos actions, scripts, docs etc, be helpful to work toward that?

@mcollina
Copy link
Member

mcollina commented Mar 9, 2024

Realistically yes, but it's still a lot of effort to rename the repos and test it all works correctly.

I'd recommend opening a fresh issue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Small changes or internal project maintenance
Projects
None yet
Development

No branches or pull requests

7 participants