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 occurrences of "master" to "main" #391

Merged
merged 1 commit into from Jan 15, 2021
Merged

Conversation

m-vdb
Copy link
Collaborator

@m-vdb m-vdb commented Jan 14, 2021

Relates to RasaHQ/rasa#6028

Proposed changes:

  • Rename occurrences of master in the repository
  • Some occurrences of master deal with other repositories outside of our control, so we can't change them.
  • There are some occurrences of RasaHQ/rasa@master that should be addressed after we make the change in the Rasa repository
  • When this PR is ready for merging, we should:
    • Make an announcement on Slack
    • Rename the master branch to main in the repo configuration here
    • Merge this PR

Status (please check what you already did):

  • made PR ready for code review
  • added some tests for the functionality
  • updated the documentation
  • updated the changelog (please check changelog for instructions)
  • reformat files using black (please check Readme for instructions)

Copy link
Contributor

@wochinge wochinge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Amazing that we're finally tackling this!

@@ -302,7 +302,7 @@ def main(args: argparse.Namespace) -> None:
generate_changelog(version)

# alpha workflow on feature branch when a version bump is required
if version.is_alpha and not git_current_branch_is_master_or_release():
if version.is_alpha and not git_current_branch_is_main_or_release():
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so thorough 😍

Base automatically changed from master to main January 15, 2021 10:05
@m-vdb m-vdb merged commit e0a196b into main Jan 15, 2021
@m-vdb m-vdb deleted the rename-default-branch branch January 15, 2021 10:05
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.

None yet

2 participants