Skip to content

Migrate from master to main #1669

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

Merged
merged 1 commit into from
Jun 28, 2021
Merged

Migrate from master to main #1669

merged 1 commit into from
Jun 28, 2021

Conversation

HonkingGoose
Copy link
Contributor

@HonkingGoose HonkingGoose commented Jun 28, 2021

Changes

  • Adjust workflow files
  • Adjust links in some files on our repo (not strictly necessary, but nice to have anyways)
  • Adjust atlas.json
  • Adjust line in TRANSLATING.md that refers to the ProGit2 default branch

Context

Well waiting on this has been very beneficial, as GitHub does most of the hard work automatically now. 😄

Read the GitHub docs before starting: https://docs.github.com/en/github/administering-a-repository/managing-branches-in-your-repository/renaming-a-branch

Steps to migrate:

  1. Review this PR, confirm this contains all the necessary changes in script files/rakefile/action workflow files.
  2. Merge this PR.
  3. Repository maintainer uses GitHub web interface to rename the master branch to main following the steps in the GitHub docs.
  4. Done.

State of repository after merging this and renaming master -> main:

  • Anybody who has forked progit2 will get a message from GitHub telling them what they need to do to update their forks.
  • Anybody who links to our current master branch will get redirected to the main branch automatically, with no breaking links/scripts on their end.
  • GitHub will make sure all open PRs are targeting the main branch
  • Dependabot will update its PRs to target main as well

Fixes #1463.

@ben ben merged commit e22f402 into progit:main Jun 28, 2021
@ben
Copy link
Member

ben commented Jun 28, 2021

Done! Please rename your local master branches to main. Thanks!

@HonkingGoose HonkingGoose deleted the migrate-to-main branch June 29, 2021 10:39
@HonkingGoose
Copy link
Contributor Author

Hooray! 😄 ✨

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Proposal: migrate ProGit2 default branch from master to main
2 participants