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.

Sign up for GitHub

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

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8c452ee
Changed the the term master to main
pr0PM Oct 22, 2020
b338e42
Updates from the review
pr0PM Nov 8, 2020
8f60b97
Merge branch 'main' into patch-1
hubwriter Nov 9, 2020
cf520c7
Force tests to rerun
hubwriter Nov 9, 2020
09b5c7c
Fix over-indentation
hubwriter Nov 9, 2020
6075af9
Force test to run again
hubwriter Nov 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions data/glossaries/external.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@
- term: branch
description: >-
A branch is a parallel version of a repository. It is contained within the
repository, but does not affect the primary or master branch allowing you to
repository, but does not affect the primary or main branch allowing you to
work freely without disrupting the "live" version. When you've made the
changes you want to make, you can merge your branch back into the master
changes you want to make, you can merge your branch back into the main
branch to publish your changes.
- term: branch restriction
description: >-
Expand Down Expand Up @@ -141,8 +141,9 @@
Short, descriptive text that accompanys a commit and communicates the change
the commit is introducing.
- term: compare branch
description: The branch you use to create a pull request.
This branch is compared to the base branch you choose for the pull request, and the changes are identified.
description: >-
The branch you use to create a pull request.
This branch is compared to the base branch you choose for the pull request, and the changes are identified.
When the pull request is merged, the base branch is updated with the changes from the compare branch.
Also known as the "head branch" of the pull request.
- term: continuous integration
Expand Down Expand Up @@ -395,12 +396,18 @@
Markdown and uses a particular form of Markdown called GitHub Flavored Markdown. See [GitHub Flavored Markdown Spec](https://github.github.com/gfm/) or [Getting started with writing and formatting on GitHub](/articles/getting-started-with-writing-and-formatting-on-github).
- term: Markup
description: A system for annotating and formatting a document.
- term: master
- term: main
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 •
edited
Loading

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

cases, this contains the local development, though that is purely by
convention and is not required.
- 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`.
- term: Members graph
description: A repository graph that shows all the forks of a repository.
- term: mention
Expand Down