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

Replaced "main" by "master" #408

Merged
merged 4 commits into from
Oct 26, 2020
Merged

Replaced "main" by "master" #408

merged 4 commits into from
Oct 26, 2020

Conversation

theokoester
Copy link
Contributor

@theokoester theokoester commented Oct 11, 2020

The default branch is normally called master, not main.

With "main" there is an error:
error: src refspec main does not match any

Why:

What's being changed:

Check off the following:

The default branch is normally called master, not main.
@welcome
Copy link

welcome bot commented Oct 11, 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.

@FloorD
Copy link

FloorD commented Oct 11, 2020

@tvachkov the change to main is a deliberate one: https://github.com/github/renaming, and https://www.bbc.com/news/technology-53050955 👍

@mitsuhiko
Copy link

mitsuhiko commented Oct 11, 2020

It would be better to name the branch explicitly on init considering the default branch name can be reconfigured.

I agree the current guide appears broken.

@theokoester
Copy link
Contributor Author

I agree on that - main is deliberated. But since the guide advices to call git init with no parameter for --initial-branch=<branch-name> resp. -b <branch-name>' this falls back to the default name: master.

Then one gets the error: src refspec main does not match any.

@mitsuhiko
Copy link

@tvachkov i think the right fix would be to change the init call to git init -b main. Github itself is changing the default branch name to main at the moment and git is making the default branch name reconfigurable. Considering that can cause confusion and a bad user experience, i think it's better to be explicit here on branch creation.

Also it's pretty evident that main is the preferred branch name now.

@janiceilene
Copy link
Contributor

@tvachkov Thanks for opening a PR and thanks everyone else for the thoughtful conversation about the right wording in this article! I'll triage this for review 💖

@janiceilene janiceilene added content This issue or pull request belongs to the Docs Content team core labels Oct 13, 2020
Copy link
Contributor

@megbird megbird left a comment

Choose a reason for hiding this comment

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

Thank you for picking up what we missed ⚡

Copy link
Contributor

@megbird megbird left a comment

Choose a reason for hiding this comment

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

Leaving another review because I had the diff backwards. As pointed out, the change from master to main was deliberate. We cannot merge any mentions of master in our content. See https://github.com/github/renaming for more information.

The right solution for this would be to use git init -b main when a user first initializes a repo. We can publish that change in this PR or you can open a new PR for that change.

@infin8x
Copy link
Contributor

infin8x commented Oct 14, 2020

Agree with @megbird that git init -b main is the right change to make here - thanks!

@github-actions
Copy link
Contributor

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 Oct 22, 2020
@janiceilene
Copy link
Contributor

@tvachkov Would you like to make the changes @megbird layed out in her comment #408 (review)? Thanks so much for taking the time to help us make these changes 💖

@janiceilene janiceilene removed the stale There is no recent activity on this issue or pull request label Oct 23, 2020
Aligning the init command to the push command: both are considering "main" instead of "master"
Copy link
Contributor

@janiceilene janiceilene left a comment

Choose a reason for hiding this comment

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

Thanks so much for making these updates @tvachkov! I'll get this branch updated and merge it once the tests are passing 🍏

@janiceilene janiceilene merged commit 806ac54 into github:main Oct 26, 2020
@github-actions
Copy link
Contributor

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

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants