Skip to content

Changed the term master to main #722

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 6 commits into from
Nov 9, 2020
Merged

Changed the term master to main #722

merged 6 commits into from
Nov 9, 2020

Conversation

pr0PM
Copy link
Contributor

@pr0PM pr0PM commented Oct 22, 2020

Since we are updating it everywhere :)

Why: master -> main

What's being changed: Glossary

The glossary section has been updated in all the relevant places that came under my eyes while reading it.

Check off the following:

Since we are updating it everywhere :)
@welcome
Copy link

welcome bot commented Oct 22, 2020

Thanks for opening this pull request! A GitHub docs team member should be by to give feedback soon. In the meantime, please check out the contributing guidelines.

@janiceilene
Copy link
Contributor

Thanks so much for the PR @pr0PM! I'll get this triaged for review 🌟

@janiceilene janiceilene added the content This issue or pull request belongs to the Docs Content team label Oct 23, 2020
description: >-
The default development branch. Whenever you create a Git repository, a
branch named "master" is created, and becomes the active branch. In most
branch named "main" is created, and becomes the active branch. In most
Copy link
Contributor

Choose a reason for hiding this comment

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

Whenever you create a Git repository, a branch named "master" is created

Unfortunately this isn't true. If you create a directory, go into it, and do git init to create a new repository, in most cases you'll find yourself in a branch called master - unless you have configured a git template that changes this to something else, like main.

I'd suggest we simplify the definition of main here to just:

Typically, the default branch for repositories on GitHub is called main.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So shall I make a commit with proposal to add separate definition of main in the glossary as suggested by you, keeping the definition of master intact since it's the current standard in Git?

Copy link
Contributor

@hubwriter hubwriter Nov 6, 2020

Choose a reason for hiding this comment

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

Good point. I think you're right: we shouldn't do away with master in the glossary all together. Could you commit another change that alters the definition for main and adds an entry for master. I think we should simplify the definition of master and indicate that it's not a term used at GitHub. How about:

- term: master
   description: >-
      The default branch in many Git repositories. By default, when you create a new Git repository on the command line a branch called `master` is created. Many tools now use an alternative name for the default branch. For example, when you create a new repository on GitHub the default branch is called `main`.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

Copy link
Contributor

@hubwriter hubwriter left a comment

Choose a reason for hiding this comment

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

Thanks for pushing this pull request. We should definitely update the glossary to use main. I've suggested a change to the definition for main.

@hubwriter hubwriter changed the title Changed the the term master to main Changed the term master to main Oct 27, 2020
@janiceilene janiceilene added the hacktoberfest-accepted We might not merge this PR before Nov 1st, but it's a wonderful Hacktoberfest contribution! label Oct 27, 2020
@github-actions
Copy link
Contributor

github-actions bot commented Nov 4, 2020

This PR is stale because it has been open 7 days with no activity and will be automatically closed in 3 days. To keep this PR open, update the PR by adding a comment or pushing a commit.

@github-actions github-actions bot added the stale There is no recent activity on this issue or pull request label Nov 4, 2020
@janiceilene
Copy link
Contributor

@pr0PM If you want to make the changes suggested in this comment and let us know when they're done, we can get this PR merged! Thank you 💝

@janiceilene janiceilene removed the stale There is no recent activity on this issue or pull request label Nov 5, 2020
pr0PM and others added 2 commits November 8, 2020 08:10
Added description for master along with main, since master is still the default on git itself.
Copy link
Contributor

@hubwriter hubwriter left a comment

Choose a reason for hiding this comment

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

@pr0PM - thanks. I'll merge this now.

@hubwriter hubwriter merged commit 5cf26cc into github:main Nov 9, 2020
@github-actions
Copy link
Contributor

github-actions bot commented Nov 9, 2020

Thanks very much for contributing! Your pull request has been merged 🎉 You should see your changes appear on the site in approximately 24 hours.

jnidzwetzki pushed a commit to jnidzwetzki/docs that referenced this pull request Oct 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
content This issue or pull request belongs to the Docs Content team hacktoberfest-accepted We might not merge this PR before Nov 1st, but it's a wonderful Hacktoberfest contribution!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants