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

Switch master to main #4480

Merged
merged 3 commits into from
May 20, 2021
Merged

Switch master to main #4480

merged 3 commits into from
May 20, 2021

Conversation

andrewtavis
Copy link
Contributor

Switching over the default branch in the examples to main to match current standards. I also wrote a note to explain the switch from master, which I tried to not make too outspoken while suggesting that main should be the default of choice. By all means feel free to make the note more blunt, and hope this helps :)

What was wrong/why is this fix needed? (quick summary only)
The examples are still using "master", which is no longer the default.

MDN URL of main page changed
https://developer.mozilla.org/en-US/docs/Learn/Tools_and_testing/Understanding_client-side_tools/Deployment

Issue number (if there is an associated issue)
N/A

Anything else that could help us review it
For the note, I used this article as a reference for October 2020.

Switching over the default branch in the examples to "main" to match current standards. I also wrote a note to explain the switch from "master," which I tried to not make too outspoken while suggesting that main should be the default of choice. By all means feel free to make the note more blunt, and hope this helps :)
@andrewtavis andrewtavis requested review from a team and chrisdavidmills and removed request for a team April 26, 2021 10:37
@rachelandrew
Copy link
Collaborator

I wonder if there is a good link to share in that note as to why this change is suggested?

@andrewtavis
Copy link
Contributor Author

I was looking for one, as I also thought it'd help. There really wasn't an announcement made about all this. The only reference I could find was to a tweet by Nat Friedman in June 2020, which is when people knew that it would happen (that is the source on all the news websites around that time). There really is no substance though.

There's also the renaming repo for GitHub that makes it clear that the change is suggested, but then does not provide a justification. That repo is the one that's referenced across GitHub channels as where people should go to learn more about the change. A link with a justification that they use in that readme comes from Software Freedom Conservancy and Git, which starts with the following, but doesn't go further:

Both Conservancy and the Git project are aware that the initial branch name, ‘master’, is offensive to some people and we empathize with those hurt by the use of that term.

I think that the above is as strong a comment from an organization related to this change as we're going to find, and it's also referenced on BitBucket and GitLab. The comment could potentially be changed to reference "version control services" and then that link would fit:

Until 2020 the default branch on Git and Git based version control services was master, which for various social reasons was switched to main. You should be aware that this older default branch may appear in projects you encounter, but we'd suggest using "main" for your own projects.

@github-actions
Copy link
Contributor

github-actions bot commented Apr 26, 2021

Preview URLs

Flaws

URL: /en-US/docs/Learn/Tools_and_testing/Understanding_client-side_tools/Deployment
Title: Deploying our app
on GitHub
Flaw count: 1

  • broken_links:
    • Link points to the page it's already on

External URLs

URL: /en-US/docs/Learn/Tools_and_testing/Understanding_client-side_tools/Deployment
Title: Deploying our app
on GitHub

(this comment was updated 2021-05-20 12:42:20.103160)

Copy link
Contributor

@peterbe peterbe left a comment

Choose a reason for hiding this comment

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

At this point, it's not a controversial "social/civil" issue because the new default is main on GitHub.
I approve but with nits.

@Ryuno-Ki
Copy link
Collaborator

I actually did some research last year for freeCodeCamp/chapter#434

@wbamberg
Copy link
Collaborator

@andrewtavis , Peter had some comments on this which were marked resolved, but I don't see the changes in the diff. Did you mean to accept the suggestions? I'm happy to merge this if we can resolve them.

@andrewtavis
Copy link
Contributor Author

@wbamberg, my apologies. I had been worried that something else was needed on my end for this. I was a bit confused on how I couldn't directly approve the changes in the review of them, so I just resolved them. I guess I didn't see how to do that properly.

With this being said, I accept the changes fully and you can merge :)

Copy link
Contributor

@peterbe peterbe left a comment

Choose a reason for hiding this comment

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

Hi @andrewtavis You ignored my suggestions. You marked them as resolved.
You need to either press the "Commit suggestion" (first you might need to "Unresolve conversation") or do it manually in your code editor.

andrewtavis and others added 2 commits May 20, 2021 13:53
…tools/deployment/index.html

Co-authored-by: Peter Bengtsson <peterbe@mozilla.com>
…tools/deployment/index.html

Co-authored-by: Peter Bengtsson <peterbe@mozilla.com>
@andrewtavis
Copy link
Contributor Author

@peterbe, thanks for the directions on that! Didn't realize the difference between resolving and committing the changes. I thought that we were waiting for Chris' review on all this. Appreciate your explanation!

@chrisdavidmills chrisdavidmills removed their request for review May 20, 2021 12:25
@chrisdavidmills
Copy link
Contributor

I don't think I need to review this as well, so removing myself from the list to avoid any more holdups.

@andrewtavis andrewtavis requested a review from peterbe May 20, 2021 14:35
@wbamberg
Copy link
Collaborator

@peterbe, thanks for the directions on that! Didn't realize the difference between resolving and committing the changes. I thought that we were waiting for Chris' review on all this. Appreciate your explanation!

No worries, @andrewtavis . You would not be the first person to be confused by this bit of GitHub's UI :).

@peterbe peterbe merged commit 94f77d8 into mdn:main May 20, 2021
@andrewtavis andrewtavis deleted the patch-1 branch May 21, 2021 07:58
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 11, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants